From 818063fb8136c82d22fdcef9e383a5539e0cab75 Mon Sep 17 00:00:00 2001
From: PiRune <runemg@gmail.com>
Date: Fri, 28 Feb 2020 20:50:40 +0100
Subject: [PATCH 1/5] adding deconz docker compose setup

---
 .templates/deconz/service.yml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .templates/deconz/service.yml

diff --git a/.templates/deconz/service.yml b/.templates/deconz/service.yml
new file mode 100644
index 00000000..8c57832b
--- /dev/null
+++ b/.templates/deconz/service.yml
@@ -0,0 +1,29 @@
+deconz:
+    image: marthoc/deconz
+    container_name: deconz
+    restart: unless-stopped
+    network_mode: bridge
+    ports:
+      - '80:80'
+      - '443:443'
+      - '5901:5901'
+    volumes:
+       - ./volumes/deconz/:/root/.local/share/dresden-elektronik/deCONZ
+    devices:
+      #ConBee II:
+      - /dev/ttyACM0
+      #ConBee:
+      # - /dev/ttyUSB0
+      #RaspBee: 
+      # - /dev/ttyAMA0 or /dev/ttyS0
+    environment:
+      - DECONZ_WEB_PORT=80
+      - DECONZ_WS_PORT=443
+      - DECONZ_VNC_MODE=1
+      - DECONZ_VNC_PORT=5901
+      - DECONZ_VNC_PASSWORD=changeme
+      - DEBUG_INFO=1
+      - DEBUG_APS=0
+      - DEBUG_ZCL=0
+      - DEBUG_ZDP=0
+      - DEBUG_OTAU=0

From 6461ed1c1db3401f327be65c1729f53531d629ee Mon Sep 17 00:00:00 2001
From: PiRune <runemg@gmail.com>
Date: Fri, 28 Feb 2020 20:59:44 +0100
Subject: [PATCH 2/5] deconz added to menu

---
 menu.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/menu.sh b/menu.sh
index 6c11d62f..05c4bdbd 100755
--- a/menu.sh
+++ b/menu.sh
@@ -15,6 +15,7 @@ declare -A cont_array=(
 	[adminer]="Adminer"
 	[openhab]="openHAB"
 	[zigbee2mqtt]="zigbee2mqtt"
+	[deconz]="deCONZ"
 	[pihole]="Pi-Hole"
 	[plex]="Plex media server"
 	[tasmoadmin]="TasmoAdmin"
@@ -31,7 +32,7 @@ declare -A cont_array=(
 
 )
 declare -a armhf_keys=("portainer" "nodered" "influxdb" "grafana" "mosquitto" "telegraf" "mariadb" "postgres"
-	"adminer" "openhab" "zigbee2mqtt" "pihole" "plex" "tasmoadmin" "rtl_433" "espruinohub"
+	"adminer" "openhab" "zigbee2mqtt" "deconz" "pihole" "plex" "tasmoadmin" "rtl_433" "espruinohub"
 	"motioneye" "webthings_gateway" "blynk_server" "nextcloud" "diyhue" "homebridge" "python")
 
 sys_arch=$(uname -m)

From 413c0ae322356fbf62bde85bbca590b66d19191e Mon Sep 17 00:00:00 2001
From: PiRune <runemg@gmail.com>
Date: Mon, 2 Mar 2020 21:15:59 +0100
Subject: [PATCH 3/5] Update service.yml

---
 .templates/deconz/service.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.templates/deconz/service.yml b/.templates/deconz/service.yml
index 8c57832b..401246e1 100644
--- a/.templates/deconz/service.yml
+++ b/.templates/deconz/service.yml
@@ -1,4 +1,4 @@
-deconz:
+  deconz:
     image: marthoc/deconz
     container_name: deconz
     restart: unless-stopped

From 050fdb157d1a0b778529176d0845a8b528dfbf5d Mon Sep 17 00:00:00 2001
From: PiRune <runemg@gmail.com>
Date: Mon, 2 Mar 2020 21:41:05 +0100
Subject: [PATCH 4/5] deconz added

---
 .templates/deconz/service.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.templates/deconz/service.yml b/.templates/deconz/service.yml
index 401246e1..41339439 100644
--- a/.templates/deconz/service.yml
+++ b/.templates/deconz/service.yml
@@ -6,7 +6,7 @@
     ports:
       - '80:80'
       - '443:443'
-      - '5901:5901'
+      - '5901:5900'
     volumes:
        - ./volumes/deconz/:/root/.local/share/dresden-elektronik/deCONZ
     devices:
@@ -17,10 +17,7 @@
       #RaspBee: 
       # - /dev/ttyAMA0 or /dev/ttyS0
     environment:
-      - DECONZ_WEB_PORT=80
-      - DECONZ_WS_PORT=443
       - DECONZ_VNC_MODE=1
-      - DECONZ_VNC_PORT=5901
       - DECONZ_VNC_PASSWORD=changeme
       - DEBUG_INFO=1
       - DEBUG_APS=0

From 614e56e06030797dd7776a7665c1a3975c385f08 Mon Sep 17 00:00:00 2001
From: PiRune <runemg@gmail.com>
Date: Mon, 2 Mar 2020 22:11:33 +0100
Subject: [PATCH 5/5] added node-red-contrib-deconz

---
 .templates/nodered/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.templates/nodered/build.sh b/.templates/nodered/build.sh
index ba5ab374..81685931 100755
--- a/.templates/nodered/build.sh
+++ b/.templates/nodered/build.sh
@@ -35,6 +35,7 @@ node_selection=$(whiptail --title "Node-RED nodes" --checklist --separate-output
 	"node-red-contrib-owntracks" " " "OFF" \
 	"node-red-contrib-alexa-local" " " "OFF" \
 	"node-red-contrib-heater-controller" " " "OFF" \
+	"node-red-contrib-deconz" " " "OFF" \
 	3>&1 1>&2 2>&3)
 
 ##echo "$check_selection"