Merge remote-tracking branch 'gcgarner/master' into Portainer-agent

Author: Willem-Dekker

.templates/qbittorrent/service.yml

@@ -0,0 +1,16 @@
+  qbittorrent:
+    image: linuxserver/qbittorrent
+    container_name: qbittorrent
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - UMASK_SET=022
+      - WEBUI_PORT=15080
+    volumes:
+      - ./volumes/qbittorrent/config:/config
+      - ./volumes/qbittorrent/downloads:/downloads
+    ports:
+      - 6881:6881
+      - 6881:6881/udp
+      - 15080:15080
+      - 1080:1080

.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

@@ -3,6 +3,9 @@
 #get path of menu correct
 pushd ~/IOTstack
 
+#This is the Display name for the menu
+#structure : [CONTAINER]=MENU Display Text
+#One entry per line to simplify PRs
 declare -A cont_array=(
 	[portainer]="Portainer"
 	[portainer_agent]="Portainer agent"
@@ -29,11 +32,42 @@ declare -A cont_array=(
 	[diyhue]="diyHue"
 	[homebridge]="Homebridge"
 	[python]="Python 3"
+	[qbittorrent]="qbittorrent"
+	[zigbee2mqttassistant]="zigbee2mqttassistant"
+)
 
+#The convension for CONTAINER is that it is the name of the .templates/CONTAINER directory and as the key below for the relevant arch
+
+# keys for CONTAINER
+# One per line to simply PR
+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" 
+	"zigbee2mqttassistant" 
+	"qbittorrent",
+	"portainer_agent"
 )
-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" "portainer_agent")
 
 sys_arch=$(uname -m)
 
@@ -192,7 +226,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
 	;;
@@ -407,7 +441,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

scripts/docker_backup.sh

@@ -58,7 +58,7 @@ if [ -f ./backups/dropbox ]; then
 
 	#upload new backup to dropbox
 	echo "uploading to dropbox"
-	$dropboxuploader upload ./backups/$backupfile $dropboxfolder
+	$dropboxuploader upload ./backups/$backupfile $backupfile
 
 	#list older files to be deleted from cloud (exludes last 7)
 	#to change dropbox backups retained, change below -7 to whatever you want