Merge branch 'master' into qbittorrent

Author: gcgarner

.templates/zigbee2mqtt/service.yml

@@ -3,8 +3,12 @@
     image: koenkk/zigbee2mqtt
     volumes:
       - ./volumes/zigbee2mqtt/data:/app/data
+      - /run/udev:/run/udev:ro
     devices:
       - /dev/ttyAMA0:/dev/ttyACM0
       #- /dev/ttyACM0:/dev/ttyACM0
-    restart: unless-stopped
+    restart: always
     network_mode: host
+    privileged: true
+    environment:
+      - TZ=Europe/Amsterdam

.templates/zigbee2mqttassistant/service.yml

@@ -0,0 +1,11 @@
+  zigbee2mqttassistant:
+    container_name: zigbee2mqttassistant
+    image: carldebilly/zigbee2mqttassistant
+    restart: unless-stopped
+    env_file:
+      - ./services/zigbee2mqttassistant/zigbee2mqttassistant.env
+    ports:
+      - 8880:80
+    environment:
+      - VIRTUAL_HOST=~^zigbee2mqttassistant\..*\.xip\.io
+      - VIRTUAL_PORT=8880

.templates/zigbee2mqttassistant/zigbee2mqttassistant.env

@@ -0,0 +1,4 @@
+#TZ=Europe/Budapest \
+Z2MA_SETTINGS__MQTTSERVER=mosquitto
+#Z2MA_SETTINGS__MQTTUSERNAME=
+#Z2MA_SETTINGS__MQTTPASSWORD=

menu.sh

@@ -29,12 +29,11 @@ declare -A cont_array=(
 	[homebridge]="Homebridge"
 	[python]="Python 3"
 	[qbittorrent]="qbittorrent"
-
+	[zigbee2mqttassistant]="zigbee2mqttassistant"
 )
 declare -a armhf_keys=("portainer" "nodered" "influxdb" "grafana" "mosquitto" "telegraf" "mariadb" "postgres"
 	"adminer" "openhab" "zigbee2mqtt" "pihole" "plex" "tasmoadmin" "rtl_433" "espruinohub"
-	"motioneye" "webthings_gateway" "blynk_server" "nextcloud" "diyhue" "homebridge" "python"
-	"qbittorrent")
+	"motioneye" "webthings_gateway" "blynk_server" "nextcloud" "diyhue" "homebridge" "python" "zigbee2mqttassistant" "qbittorrent")
 
 sys_arch=$(uname -m)
 
@@ -193,7 +192,7 @@ case $mainmenu_selection in
 		sudo apt install -y docker-compose
 	fi
 
-	if (whiptail --title "Restart Required" --yesno "It is recommended that you restart you device now. Select yes to do so now" 20 78); then
+	if (whiptail --title "Restart Required" --yesno "It is recommended that you restart your device now. Select yes to do so now" 20 78); then
 		sudo reboot
 	fi
 	;;
@@ -408,7 +407,7 @@ case $mainmenu_selection in
 		"tinker" " " \
 		3>&1 1>&2 2>&3)
 	if [ -n "$hassio_machine" ]; then
-		curl -sL https://raw.githubusercontent.com/home-assistant/hassio-installer/master/hassio_install.sh | sudo bash -s -- -m $hassio_machine
+		curl -sL https://raw.githubusercontent.com/home-assistant/supervised-installer/master/installer.sh | sudo bash -s -- -m $hassio_machine
 	else
 		echo "no selection"
 		exit