Merge branch 'master' into feature/AddZigbee2MqttAssistant

.gitignore

@@ -2,5 +2,8 @@
 /services/
 /volumes/
 /backups/
+/.tmp/*
 docker-compose.yml
-.outofdate
+.outofdate
+
+!.gitkeep

.templates/deconz/build.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+#deCONZ device configuration
+
+DOCKER_COMPOSE_PATH=./.tmp/docker-compose.tmp.yml
+
+if [[ ! -f $DOCKER_COMPOSE_PATH ]]; then
+        echo "[deCONZ] Warning: $DOCKER_COMPOSE_PATH does not exist."
+fi
+
+device_selection=$(whiptail --radiolist --title "Select deCONZ gateway" --notags \
+        "Use the [SPACEBAR] to select your deCONZ gateway from the list below AND MAKE SURE IT IS PLUGGED IN (if not, press [ESC])." 20 78 12 \
+        "ConBeeII" "ConBee II " "ON" \
+        "ConBee" "ConBee " "OFF" \
+        "RaspBee" "RaspBee " "OFF" \
+        3>&1 1>&2 2>&3)
+
+        case $device_selection in
+
+                        "ConBeeII")
+                                if [[ ! -f ./.templates/deconz/service_conbee_II.yml ]]; then
+                                        echo "Error: ./.templates/deconz/service_conbee_II.yml does not exist."
+                                else
+                                        cat ./.templates/deconz/service_conbee_II.yml >> $DOCKER_COMPOSE_PATH
+                                        echo "...copied ConBee II config from template"
+                                fi
+                                ;;
+                        "ConBee")
+                                if [[ ! -f ./.templates/deconz/service_conbee.yml ]]; then
+                                        echo "Error: ./.templates/deconz/service_conbee.yml does not exist."
+                                else
+                                        cat ./.templates/deconz/service_conbee.yml >> $DOCKER_COMPOSE_PATH
+                                        echo "...copied ConBee config from template"
+                                fi
+                                ;;
+                        "RaspBee")
+                                if [[ ! -f ./.templates/deconz/service_raspbee.yml ]]; then
+                                        echo "Error: ./.templates/deconz/service_raspbee.yml does not exist."
+                                else
+                                        cat ./.templates/deconz/service_raspbee.yml >> $DOCKER_COMPOSE_PATH
+                                        echo "...copied RaspBee config from template"
+                                fi
+                                ;;
+                        esac

.templates/deconz/service.yml

@@ -0,0 +1 @@
+

.templates/deconz/service_conbee.yml

@@ -0,0 +1,21 @@
+  deconz:
+    image: marthoc/deconz
+    container_name: deconz
+    restart: unless-stopped
+    ports:
+      - '8090:80'
+      - '443:443'
+      - '5901:5900'
+    volumes:
+      - ./volumes/deconz/:/root/.local/share/dresden-elektronik/deCONZ
+    devices:
+      #ConBee:
+      - /dev/ttyUSB0
+    environment:
+      - DECONZ_VNC_MODE=1
+      - DECONZ_VNC_PASSWORD=changeme
+      - DEBUG_INFO=1
+      - DEBUG_APS=0
+      - DEBUG_ZCL=0
+      - DEBUG_ZDP=0
+      - DEBUG_OTAU=0

.templates/deconz/service_conbee_II.yml

@@ -0,0 +1,21 @@
+  deconz:
+    image: marthoc/deconz
+    container_name: deconz
+    restart: unless-stopped
+    ports:
+      - '8090:80'
+      - '443:443'
+      - '5901:5900'
+    volumes:
+      - ./volumes/deconz/:/root/.local/share/dresden-elektronik/deCONZ
+    devices:
+      #ConBee II:
+      - /dev/ttyACM0
+    environment:
+      - DECONZ_VNC_MODE=1
+      - DECONZ_VNC_PASSWORD=changeme
+      - DEBUG_INFO=1
+      - DEBUG_APS=0
+      - DEBUG_ZCL=0
+      - DEBUG_ZDP=0
+      - DEBUG_OTAU=0

.templates/deconz/service_raspbee.yml

@@ -0,0 +1,22 @@
+  deconz:
+    image: marthoc/deconz
+    container_name: deconz
+    restart: unless-stopped
+    ports:
+      - '8090:80'
+      - '443:443'
+      - '5901:5900'
+    volumes:
+      - ./volumes/deconz/:/root/.local/share/dresden-elektronik/deCONZ
+    devices:
+      #RaspBee:
+      - /dev/ttyAMA0
+      #alternatively - /dev/ttyS0
+    environment:
+      - DECONZ_VNC_MODE=1
+      - DECONZ_VNC_PASSWORD=changeme
+      - DEBUG_INFO=1
+      - DEBUG_APS=0
+      - DEBUG_ZCL=0
+      - DEBUG_ZDP=0
+      - DEBUG_OTAU=0

.templates/dozzle/service.yml

@@ -0,0 +1,9 @@
+  dozzle:
+    container_name: dozzle
+    image: amir20/dozzle:latest 
+    restart: unless-stopped
+    network_mode: host
+    ports:
+      - 8888:8080
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock

.templates/grafana/service.yml

@@ -1,6 +1,6 @@
   grafana:
     container_name: grafana
-    image: grafana/grafana:6.3.6
+    image: grafana/grafana
     restart: unless-stopped
     user: "0"
     ports:

.templates/mosquitto/mosquitto.conf

@@ -1,6 +1,8 @@
 persistence true
 persistence_location /mosquitto/data/
-log_dest file /mosquitto/log/mosquitto.log
+#log_dest file /mosquitto/log/mosquitto.log
+# To avoid flash wearing
+log_dest stdout
 
 #Uncomment to enable passwords
 #password_file /mosquitto/config/pwfile

.templates/nodered/build.sh

@@ -6,7 +6,13 @@ node_selection=$(whiptail --title "Node-RED nodes" --checklist --separate-output
 	"Use the [SPACEBAR] to select the nodes you want preinstalled" 20 78 12 -- \
 	"node-red-node-pi-gpiod" " " "ON" \
 	"node-red-dashboard" " " "ON" \
+	"node-red-contrib-influxdb" " " "ON" \
+	"node-red-contrib-boolean-logic" " " "ON" \
+	"node-red-node-rbe" " " "ON" \
+	"node-red-configurable-ping" " " "ON" \
 	"node-red-node-openweathermap" " " "OFF" \
+	"node-red-contrib-discord" " " "OFF" \
+	"node-red-node-email" " " "on" \
 	"node-red-node-google" " " "OFF" \
 	"node-red-node-emoncms" " " "OFF" \
 	"node-red-node-geofence" " " "OFF" \
@@ -15,7 +21,6 @@ node_selection=$(whiptail --title "Node-RED nodes" --checklist --separate-output
 	"node-red-node-smooth" " " "OFF" \
 	"node-red-node-darksky" " " "OFF" \
 	"node-red-node-sqlite" " " "OFF" \
-	"node-red-contrib-influxdb" " " "ON" \
 	"node-red-contrib-config" " " "OFF" \
 	"node-red-contrib-grove" " " "OFF" \
 	"node-red-contrib-diode" " " "OFF" \
@@ -29,12 +34,12 @@ node_selection=$(whiptail --title "Node-RED nodes" --checklist --separate-output
 	"node-red-contrib-isonline" " " "OFF" \
 	"node-red-contrib-npm" " " "OFF" \
 	"node-red-contrib-file-function" " " "OFF" \
-	"node-red-contrib-boolean-logic" " " "OFF" \
 	"node-red-contrib-home-assistant-websocket" " " "OFF" \
 	"node-red-contrib-blynk-ws" " " "OFF" \
 	"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"

.templates/pihole/pihole.env

@@ -5,12 +5,12 @@ WEBPASSWORD=pihole
 #DNSSEC=false
 #DNS_BOGUS_PRIV=True
 #CONDITIONAL_FORWARDING=False
-#CONDITIONAL_FORWARDING_IP=your_router_ip_here (only if CONDITIONAL_FORWARDING=ture)
+#CONDITIONAL_FORWARDING_IP=your_router_ip_here (only if CONDITIONAL_FORWARDING=true)
 #CONDITIONAL_FORWARDING_DOMAIN=optional
 #CONDITIONAL_FORWARDING_REVERSE=optional
 #ServerIP=your_Pi's_IP_here  << recommended
 #ServerIPv6= your_Pi's_ipv6_here << Required if using ipv6
 #VIRTUAL_HOST=$ServerIP
 #IPv6=True
 INTERFACE=eth0
-#DNSMASQ_LISTENING=local
+#DNSMASQ_LISTENING=local

.templates/timescaledb/service.yml

@@ -0,0 +1,10 @@
+  timescaledb:
+    container_name: timescaledb
+    image: timescale/timescaledb:latest-pg12
+    restart: unless-stopped
+    env_file:
+      - ./services/timescaledb/timescaledb.env
+    ports:
+      - 5432:5432
+    volumes:
+      - ./volumes/timescaledb/data:/var/lib/postgresql/data

.templates/timescaledb/timescaledb.env

@@ -0,0 +1,3 @@
+POSTGRES_USER=postuser
+POSTGRES_PASSWORD=postpassword
+POSTGRES_DB=postdb

README.md

@@ -1,13 +1,16 @@
 # IOT Stack
 IOTstack is a builder for docker-compose to easily make and maintain IoT stacks on the Raspberry Pi.
 
+
 ## Documentation for the project: 
 
 https://sensorsiot.github.io/IOTstack/
 
+
 ## Video
 https://youtu.be/a6mjt8tWUws
 
+
 ## Installation
 1. On the (RPi) lite image you will need to install git first
 
@@ -33,3 +36,22 @@ cd ~/IOTstack && bash ./menu.sh
 ```
 docker-compose up -d
 ```
+
+## Experimental Features
+Want to have the latest and greatest features? Switch to the experimental branch:
+```
+git pull && git checkout experimental
+./menu.sh
+```
+
+Do note that the experimental branch may be broken, or may break your setup, so ensure you have a good backup, and please report any issues.
+
+## Migrating from the old repo?
+```
+cd ~/IOTstack/
+git remote set-url origin https://github.com/SensorsIot/IOTstack.git
+git pull origin master
+docker-compose down
+./menu.sh
+docker-compose up -d
+```