aljaz/addons
1
0
Fork 0
mirror of https://github.com/aljazceru/addons.git synced 2025-12-18 13:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

deconz: Change API port to 40850, hotfix discovery (#923)

Browse Source
This commit is contained in:
Franck Nijhof
2019-12-19 22:30:45 +01:00
committed by Pascal Vizeli
parent 2f572e5d2c
commit afeab667dd
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deconz/CHANGELOG.md
View File

@@ -1,5 +1,9 @@
# Changelog # Changelog
## 4.1
- Change internal API port back to 40850, to prevent issue with discovery
## 4.0 ## 4.0
- Bump deCONZ to 2.05.72 - Bump deCONZ to 2.05.72

2
deconz/config.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "deCONZ", "name": "deCONZ",
"version": "4.0", "version": "4.1",
"slug": "deconz", "slug": "deconz",
"description": "Control a ZigBee network with ConBee or RaspBee by Dresden Elektronik", "description": "Control a ZigBee network with ConBee or RaspBee by Dresden Elektronik",
"arch": ["amd64", "armhf", "aarch64"], "arch": ["amd64", "armhf", "aarch64"],

6
deconz/data/discovery.sh
View File

@@ -9,7 +9,7 @@ function _deconz_api() {
local serial local serial
# Register an API key for Home Assistant # 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::log.debug "${result}"
bashio::exit.nok "Can't get API key from deCONZ gateway" bashio::exit.nok "Can't get API key from deCONZ gateway"
fi fi
@@ -28,7 +28,7 @@ function _deconz_api() {
fi fi
# Get bridge ID from API # 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 then
bashio::log.debug "${result}" bashio::log.debug "${result}"
bashio::exit.nok "Can't get data from deCONZ gateway" bashio::exit.nok "Can't get data from deCONZ gateway"
@@ -53,7 +53,7 @@ function _send_discovery() {
config=$(bashio::var.json \ config=$(bashio::var.json \
host "$(hostname)" \ host "$(hostname)" \
port "^8080" \ port "^40850" \
api_key "${api_key}" \ api_key "${api_key}" \
serial "${serial}" \ serial "${serial}" \
) )

2
deconz/data/nginx.conf
View File

@@ -46,7 +46,7 @@ http {
location / { location / {
proxy_redirect off; proxy_redirect off;
proxy_pass http://localhost:8080; proxy_pass http://localhost:40850;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;

4
deconz/data/run.sh
View File

@@ -86,13 +86,13 @@ deCONZ \
--dbg-zcl="${DBG_ZCL}" \ --dbg-zcl="${DBG_ZCL}" \
--dbg-zdp="${DBG_ZDP}" \ --dbg-zdp="${DBG_ZDP}" \
--upnp=0 \ --upnp=0 \
--http-port=8080 \ --http-port=40850 \
--ws-port=8081 \ --ws-port=8081 \
--dev="${DECONZ_DEVICE}" & --dev="${DECONZ_DEVICE}" &
WAIT_PIDS+=($!) WAIT_PIDS+=($!)
# Wait for deCONZ to start before continuing # Wait for deCONZ to start before continuing
bashio::net.wait_for 8080 bashio::net.wait_for 40850
# Start Nginx proxy # Start Nginx proxy
bashio::log.info "Starting Nginx..." bashio::log.info "Starting Nginx..."