diff --git a/home-assistant/configuration.yaml.template b/home-assistant/configuration.yaml.template deleted file mode 100644 index 6fc7dd3..0000000 --- a/home-assistant/configuration.yaml.template +++ /dev/null @@ -1,6 +0,0 @@ -default_config: - -http: - use_x_forwarded_for: true - trusted_proxies: - - $NETWORK_IP/16 \ No newline at end of file diff --git a/home-assistant/docker-compose.yml b/home-assistant/docker-compose.yml index 90bd788..299e965 100644 --- a/home-assistant/docker-compose.yml +++ b/home-assistant/docker-compose.yml @@ -1,14 +1,9 @@ version: "3.7" services: - app_proxy: - environment: - APP_HOST: home-assistant_server_1 - APP_PORT: 8123 - PROXY_AUTH_ADD: "false" - server: - image: homeassistant/home-assistant:2023.6@sha256:8e069fcfddbd95c0acff88b9e515e3b208c2a5b4ad801a8f0cb8b55be417fc45 + image: homeassistant/home-assistant:2023.6.3@sha256:1dd89ec1ce8de5ea869a489d5699bd91f77058ffaa6f5484b3e81323128abd2c + network_mode: host + # UI at default port 8123 volumes: - - ${APP_DATA_DIR}/data:/config - - ${APP_DATA_DIR}/configuration.yaml:/config/configuration.yaml + - ${APP_DATA_DIR}/data:/config \ No newline at end of file diff --git a/home-assistant/hooks/pre-start b/home-assistant/hooks/pre-start new file mode 100755 index 0000000..64e255b --- /dev/null +++ b/home-assistant/hooks/pre-start @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +# This script checks if a pre-host-network version of the app is currently installed and, if it is, +# deletes the old configuration files to allow Home Assistant to initialize properly. + +APP_DIR="$(dirname "${BASH_SOURCE[0]}")/.." +HOME_ASSISTANT_CONFIG_DIR="${APP_DIR}/data" +PRE_HOST_NETWORK_CONFIGURATION_YAML="${APP_DIR}/configuration.yaml" +PRE_HOST_NETWORK_CONFIGURATION_TEMPLATE="${APP_DIR}/configuration.yaml.template" +CONFIGURATION_YAML="${HOME_ASSISTANT_CONFIG_DIR}/configuration.yaml" + +# Check for the existence of pre-host-network configuration files and delete them if they exist +if [[ -f "${PRE_HOST_NETWORK_CONFIGURATION_YAML}" ]] || [[ -f "${PRE_HOST_NETWORK_CONFIGURATION_TEMPLATE}" ]]; then + echo "This is a pre-host-network installation" + + if [[ -f "${PRE_HOST_NETWORK_CONFIGURATION_YAML}" ]]; then + echo "Deleting old configuration.yaml" + rm "${PRE_HOST_NETWORK_CONFIGURATION_YAML}" + fi + + if [[ -f "${PRE_HOST_NETWORK_CONFIGURATION_TEMPLATE}" ]]; then + echo "Deleting old configuration.yaml.template" + rm "${PRE_HOST_NETWORK_CONFIGURATION_TEMPLATE}" + fi + + # Also delete the configuration.yml in the data dir + if [[ -f "${CONFIGURATION_YAML}" ]]; then + echo "Deleting old configuration.yaml in data dir" + rm "${CONFIGURATION_YAML}" + fi +fi \ No newline at end of file diff --git a/home-assistant/umbrel-app.yml b/home-assistant/umbrel-app.yml index fe0eea6..9829203 100644 --- a/home-assistant/umbrel-app.yml +++ b/home-assistant/umbrel-app.yml @@ -2,7 +2,7 @@ manifestVersion: 1 id: home-assistant category: automation name: Home Assistant -version: "2023.6" +version: "2023.6.3" tagline: Home automation that puts local control & privacy first description: >- Open source home automation that puts local control and privacy @@ -23,7 +23,7 @@ website: https://home-assistant.io dependencies: [] repo: https://github.com/home-assistant/core support: https://community.home-assistant.io -port: 8083 +port: 8123 gallery: - 1.jpg - 2.jpg @@ -33,6 +33,23 @@ defaultUsername: "" defaultPassword: "" torOnly: false releaseNotes: >- - Full changelog (for 2023.6.0) can found at: https://www.home-assistant.io/changelogs/core-2023.6 + 🚨 IMPORTANT: If you are using both the Home Assistant and Tallycoin Connect apps on your Umbrel, please + update Tallycoin Connect to the latest version before updating Home Assistant. This step ensures a smooth + operation by preventing any port conflicts between the two apps. + + + For Home Assistant mobile app users, there's a minor yet significant change. In your Home Assistant mobile + app, please use the new port number '8123' to connect it to the Home Assistant app on your Umbrel, or + simply reinstall the mobile app for automatic Umbrel detection. + + + This update brings Home Assistant to version 2023.6.3, and also includes automatic device discovery for + devices connected to the same network, and the ability to save your personalized settings and automations! + + + Home Assistant 2023.6.3 brings a variety of improvements and bug fixes. Services like Fully Kiosk, + Fortios device tracker, and Insteon events are now handled more efficiently. The YouTube integration + has been refined, selecting lower quality thumbnails for better performance and introducing + re-authentication strings for enhanced security. Read more at: https://github.com/home-assistant/core/releases/tag/2023.6.3 submitter: Umbrel submission: https://github.com/getumbrel/umbrel/commit/9d79cffae608c6a6ab077f859c1c531a581cf926 diff --git a/tallycoin-connect/hooks/post-update b/tallycoin-connect/hooks/post-update new file mode 100755 index 0000000..01b0bb2 --- /dev/null +++ b/tallycoin-connect/hooks/post-update @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# restart app so that new port number is sourced correctly +"${UMBREL_ROOT}/scripts/app" restart "${APP_ID}" & \ No newline at end of file diff --git a/tallycoin-connect/umbrel-app.yml b/tallycoin-connect/umbrel-app.yml index 51f8880..d77124b 100644 --- a/tallycoin-connect/umbrel-app.yml +++ b/tallycoin-connect/umbrel-app.yml @@ -2,7 +2,7 @@ manifestVersion: 1 id: tallycoin-connect category: bitcoin name: Tallycoin Connect -version: "1.8.0" +version: "1.8.0-1" tagline: Crowdfund donations directly to your Umbrel node with Tallycoin. description: Tallycoin is a crowdfunding platform with bitcoin and lightning donations. Together with the Tallycoin Connect app, you can receive donations directly to your Umbrel node. Zero fees! developer: djbooth007 @@ -11,7 +11,7 @@ dependencies: - lightning repo: https://github.com/djbooth007/tallycoin_connect support: https://github.com/djbooth007/tallycoin_connect/issues -port: 8123 +port: 8124 gallery: - 1.jpg - 2.jpg @@ -19,8 +19,15 @@ gallery: path: "" deterministicPassword: true releaseNotes: >- - Added: LNURL and Lightning Address compatibility. + 🚨 IMPORTANT: If you are using both the Tallycoin Connect and Home Assistant apps on your Umbrel, + please update Tallycoin Connect to the latest version before updating Home Assistant. This step + ensures a smooth operation by preventing any port conflicts between the two apps. - Fixed: Mobile view of transaction page. + + This update changes the port that Tallycoin Connect runs on from 8123 to 8124. This is to avoid a + port conflict with the Home Assistant app, which now runs on port 8123. + + + There are no updates to the Tallycoin Connect app itself. submitter: d11n submission: https://github.com/getumbrel/umbrel/pull/1052