diff --git a/deconz/CHANGELOG.md b/deconz/CHANGELOG.md index bd435f9..02c6aa6 100644 --- a/deconz/CHANGELOG.md +++ b/deconz/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 4.1 + +- Change internal API port back to 40850, to prevent issue with discovery + ## 4.0 - Bump deCONZ to 2.05.72 diff --git a/deconz/config.json b/deconz/config.json index 36c8a8a..efc0ca9 100644 --- a/deconz/config.json +++ b/deconz/config.json @@ -1,6 +1,6 @@ { "name": "deCONZ", - "version": "4.0", + "version": "4.1", "slug": "deconz", "description": "Control a ZigBee network with ConBee or RaspBee by Dresden Elektronik", "arch": ["amd64", "armhf", "aarch64"], diff --git a/deconz/data/discovery.sh b/deconz/data/discovery.sh index 5126c21..c6fcb14 100644 --- a/deconz/data/discovery.sh +++ b/deconz/data/discovery.sh @@ -9,7 +9,7 @@ function _deconz_api() { local serial # Register an API key for Home Assistant - if ! result="$(curl --silent --show-error --request POST -d '{"devicetype": "Home Assistant"}' "http://127.0.0.1:8080/api")"; then + if ! result="$(curl --silent --show-error --request POST -d '{"devicetype": "Home Assistant"}' "http://127.0.0.1:40850/api")"; then bashio::log.debug "${result}" bashio::exit.nok "Can't get API key from deCONZ gateway" fi @@ -28,7 +28,7 @@ function _deconz_api() { fi # Get bridge ID from API - if ! result="$(curl --silent --show-error --request GET "http://127.0.0.1:8080/api/${api_key}/config")"; + if ! result="$(curl --silent --show-error --request GET "http://127.0.0.1:40850/api/${api_key}/config")"; then bashio::log.debug "${result}" bashio::exit.nok "Can't get data from deCONZ gateway" @@ -53,7 +53,7 @@ function _send_discovery() { config=$(bashio::var.json \ host "$(hostname)" \ - port "^8080" \ + port "^40850" \ api_key "${api_key}" \ serial "${serial}" \ ) diff --git a/deconz/data/nginx.conf b/deconz/data/nginx.conf index 1b5d507..ac53ca7 100644 --- a/deconz/data/nginx.conf +++ b/deconz/data/nginx.conf @@ -46,7 +46,7 @@ http { location / { proxy_redirect off; - proxy_pass http://localhost:8080; + proxy_pass http://localhost:40850; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; diff --git a/deconz/data/run.sh b/deconz/data/run.sh index 1a6f635..47c4d71 100755 --- a/deconz/data/run.sh +++ b/deconz/data/run.sh @@ -86,13 +86,13 @@ deCONZ \ --dbg-zcl="${DBG_ZCL}" \ --dbg-zdp="${DBG_ZDP}" \ --upnp=0 \ - --http-port=8080 \ + --http-port=40850 \ --ws-port=8081 \ --dev="${DECONZ_DEVICE}" & WAIT_PIDS+=($!) # Wait for deCONZ to start before continuing -bashio::net.wait_for 8080 +bashio::net.wait_for 40850 # Start Nginx proxy bashio::log.info "Starting Nginx..."