From e2557a24a191970125417bd84fae8bd554788e27 Mon Sep 17 00:00:00 2001 From: JyothishGeorge Date: Sun, 15 Mar 2020 16:16:09 +0000 Subject: [PATCH 1/5] Update service.yml --- .templates/zigbee2mqtt/service.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.templates/zigbee2mqtt/service.yml b/.templates/zigbee2mqtt/service.yml index 9bcf16d6..6538a330 100644 --- a/.templates/zigbee2mqtt/service.yml +++ b/.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 From 98101cd46eb0170a35750515551131363b02fe9c Mon Sep 17 00:00:00 2001 From: Gianpaolo Macario Date: Mon, 23 Mar 2020 18:20:46 +0100 Subject: [PATCH 2/5] menu.sh: Fix small typo in msg "Restart Required" s/restart you device/restart your device/ --- menu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.sh b/menu.sh index 6c11d62f..db259a6a 100755 --- a/menu.sh +++ b/menu.sh @@ -191,7 +191,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 ;; From aecaa376b359e0c47b544d506f84a15166f70cb5 Mon Sep 17 00:00:00 2001 From: JyothishGeorge Date: Mon, 30 Mar 2020 22:28:16 +0100 Subject: [PATCH 3/5] url changed --- menu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.sh b/menu.sh index 6c11d62f..4ead728a 100755 --- a/menu.sh +++ b/menu.sh @@ -406,7 +406,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/installer/master/installer.sh | sudo bash -s -- -m $hassio_machine else echo "no selection" exit From 262bca3b96e6b0ead40c655b8d234aff18f82d9e Mon Sep 17 00:00:00 2001 From: JyothishGeorge Date: Sat, 4 Apr 2020 22:43:17 +0100 Subject: [PATCH 4/5] Update menu.sh Updated the installer script url --- menu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.sh b/menu.sh index 4ead728a..f651383f 100755 --- a/menu.sh +++ b/menu.sh @@ -406,7 +406,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/installer/master/installer.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 From 2ce817281079583a924c55610f9f149118d76917 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Mon, 13 Apr 2020 23:23:01 +0200 Subject: [PATCH 5/5] Add support of Zigbee2Mqtt Assistant --- .templates/zigbee2mqttassistant/service.yml | 11 +++++++++++ .../zigbee2mqttassistant/zigbee2mqttassistant.env | 4 ++++ menu.sh | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100755 .templates/zigbee2mqttassistant/service.yml create mode 100755 .templates/zigbee2mqttassistant/zigbee2mqttassistant.env diff --git a/.templates/zigbee2mqttassistant/service.yml b/.templates/zigbee2mqttassistant/service.yml new file mode 100755 index 00000000..75c5f595 --- /dev/null +++ b/.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 diff --git a/.templates/zigbee2mqttassistant/zigbee2mqttassistant.env b/.templates/zigbee2mqttassistant/zigbee2mqttassistant.env new file mode 100755 index 00000000..0ce939db --- /dev/null +++ b/.templates/zigbee2mqttassistant/zigbee2mqttassistant.env @@ -0,0 +1,4 @@ +#TZ=Europe/Budapest \ +Z2MA_SETTINGS__MQTTSERVER=mosquitto +#Z2MA_SETTINGS__MQTTUSERNAME= +#Z2MA_SETTINGS__MQTTPASSWORD= diff --git a/menu.sh b/menu.sh index 6c11d62f..476825fb 100755 --- a/menu.sh +++ b/menu.sh @@ -28,11 +28,11 @@ declare -A cont_array=( [diyhue]="diyHue" [homebridge]="Homebridge" [python]="Python 3" - + [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") + "motioneye" "webthings_gateway" "blynk_server" "nextcloud" "diyhue" "homebridge" "python" "zigbee2mqttassistant") sys_arch=$(uname -m)