From d0b14ef65bcf7e72485a3e17aa882e5b0886d39c Mon Sep 17 00:00:00 2001 From: Stefan Larsen <33205551+bloody2k@users.noreply.github.com> Date: Thu, 16 Jan 2020 19:30:32 +0100 Subject: [PATCH 01/20] Update .gitignore --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5f09a9ea..1f711369 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -#ignore data folders for containers +#ignore data folders for containers test sl /services/ /volumes/ /backups/ docker-compose.yml -.outofdate \ No newline at end of file +.outofdate From f3d15f0fb05a673c714ddd65f410c25e5853a5d6 Mon Sep 17 00:00:00 2001 From: Stefan Larsen <33205551+bloody2k@users.noreply.github.com> Date: Thu, 16 Jan 2020 20:58:17 +0100 Subject: [PATCH 02/20] Update menu.sh HASS Data --- menu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.sh b/menu.sh index 6c11d62f..b84cd21e 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/hassio-installer/master/hassio_install.sh | sudo bash -s -- -d ./volumes/hassio -m $hassio_machine else echo "no selection" exit From eba11b7dfbae10099754a5703cd950843e194d7a Mon Sep 17 00:00:00 2001 From: Stefan Larsen <33205551+bloody2k@users.noreply.github.com> Date: Thu, 16 Jan 2020 22:03:15 +0100 Subject: [PATCH 03/20] Update menu.sh Changing datafolder for HASSIO --- menu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.sh b/menu.sh index b84cd21e..074f661e 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 -- -d ./volumes/hassio -m $hassio_machine + curl -sL https://raw.githubusercontent.com/home-assistant/hassio-installer/master/hassio_install.sh | sudo bash -s -- -d ~/IOTstack/volumes/hassio -m $hassio_machine else echo "no selection" exit From 39b9c03d613bd0adc301ad75e3906e414129f7b2 Mon Sep 17 00:00:00 2001 From: Stefan Larsen Date: Sat, 18 Jan 2020 12:42:20 +0000 Subject: [PATCH 04/20] Added Esphome, Duplicati, HASS-config & Valetudomap --- .templates/duplicati/service.yml | 10 ++++++++++ .templates/esphome/service.yml | 14 ++++++++++++++ .templates/hass-configurator/service.yml | 11 +++++++++++ .templates/valetudomap/service.yml | 9 +++++++++ 4 files changed, 44 insertions(+) create mode 100644 .templates/duplicati/service.yml create mode 100644 .templates/esphome/service.yml create mode 100644 .templates/hass-configurator/service.yml create mode 100644 .templates/valetudomap/service.yml diff --git a/.templates/duplicati/service.yml b/.templates/duplicati/service.yml new file mode 100644 index 00000000..5642f9b6 --- /dev/null +++ b/.templates/duplicati/service.yml @@ -0,0 +1,10 @@ + duplicati: + container_name: Duplicati + restart: unless-stopped + image: lsioarmhf/duplicati + network_mode: host + volumes: + - /:/source + - ./volumes/duplicati:/config + - /etc/localtime:/etc/localtime:ro + diff --git a/.templates/esphome/service.yml b/.templates/esphome/service.yml new file mode 100644 index 00000000..6d39a2a5 --- /dev/null +++ b/.templates/esphome/service.yml @@ -0,0 +1,14 @@ + esphome: + container_name: esphome + network_mode: host + restart: unless-stopped + environment: + - HOME = "/" + image: esphome/esphome-armv7:latest + ports: + - "6052:6052" + - "6123:6123" + volumes: + - ./volumes/esphome:/config:rw + command: config/ dashboard + diff --git a/.templates/hass-configurator/service.yml b/.templates/hass-configurator/service.yml new file mode 100644 index 00000000..42565079 --- /dev/null +++ b/.templates/hass-configurator/service.yml @@ -0,0 +1,11 @@ + hassconfig: + container_name: HASS-Configurator + restart: unless-stopped + image: marthoc/hass-configurator:latest + volumes: + - ./volumes/hassio/homeassistant:/hass-config + - ./volumes/hass-configurator:/config + - /etc/localtime:/etc/localtime:ro + ports: + - "3218:3218" + diff --git a/.templates/valetudomap/service.yml b/.templates/valetudomap/service.yml new file mode 100644 index 00000000..9433e870 --- /dev/null +++ b/.templates/valetudomap/service.yml @@ -0,0 +1,9 @@ + valetudomap: + container_name: ValetudoMap + restart: unless-stopped + image: dmkif/icantbelieveitsnotvaletudo:latest-arm + depends_on: + - "mosquitto" + volumes: + - ./volumes/valetudomap/config.json:/app/config.json + From ebe74a1fa7ad93090ba04bd22d28b5f1d9668814 Mon Sep 17 00:00:00 2001 From: Stefan Larsen <33205551+bloody2k@users.noreply.github.com> Date: Mon, 20 Jan 2020 21:32:45 +0100 Subject: [PATCH 05/20] Add monitor - service --- .templates/monitor/services.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .templates/monitor/services.yml diff --git a/.templates/monitor/services.yml b/.templates/monitor/services.yml new file mode 100644 index 00000000..286f5d46 --- /dev/null +++ b/.templates/monitor/services.yml @@ -0,0 +1,9 @@ + monitor: + container_name: Monitor + network_mode: host + privileged: true + restart: unless-stopped + image: mashupmill/presence-monitor:latest + volumes: + - ./volumes/monitor:/config + - /etc/localtime:/etc/localtime:ro From e4154f055aa104965609dd454f9b0511fb63bb33 Mon Sep 17 00:00:00 2001 From: Stefan Larsen <33205551+bloody2k@users.noreply.github.com> Date: Mon, 20 Jan 2020 22:34:36 +0100 Subject: [PATCH 06/20] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1f711369..76ce22ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -#ignore data folders for containers test sl +#ignore data folders for containers /services/ /volumes/ /backups/ From 01c3d3ec014dec176bd03ca80d65844fcb09d157 Mon Sep 17 00:00:00 2001 From: Stefan Larsen Date: Tue, 21 Jan 2020 21:08:07 +0100 Subject: [PATCH 07/20] Revert "Update .gitignore" This reverts commit e4154f055aa104965609dd454f9b0511fb63bb33. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 76ce22ca..1f711369 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -#ignore data folders for containers +#ignore data folders for containers test sl /services/ /volumes/ /backups/ From d1d7059d0e4cc00a1e00a5ad7883b0e82cfac872 Mon Sep 17 00:00:00 2001 From: Stefan Larsen Date: Tue, 21 Jan 2020 21:08:54 +0100 Subject: [PATCH 08/20] Revert "Update .gitignore" This reverts commit d0b14ef65bcf7e72485a3e17aa882e5b0886d39c. --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1f711369..5f09a9ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -#ignore data folders for containers test sl +#ignore data folders for containers /services/ /volumes/ /backups/ docker-compose.yml -.outofdate +.outofdate \ No newline at end of file From 829facceb8b7217ae77283c8a7f3a8c27c5f65f9 Mon Sep 17 00:00:00 2001 From: Stefan Larsen <33205551+bloody2k@users.noreply.github.com> Date: Tue, 21 Jan 2020 21:13:20 +0100 Subject: [PATCH 09/20] Create settings.conf Adding Hass-configurator config file --- .templates/hass-configurator/settings.conf | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .templates/hass-configurator/settings.conf diff --git a/.templates/hass-configurator/settings.conf b/.templates/hass-configurator/settings.conf new file mode 100644 index 00000000..f13f7e75 --- /dev/null +++ b/.templates/hass-configurator/settings.conf @@ -0,0 +1,17 @@ +{ + "LISTENIP": "0.0.0.0", + "LISTENPORT": 3218, + "BASEPATH": "/hass-config", + "SSL_CERTIFICATE": null, + "SSL_KEY": null, + "HASS_API": "http://192.168.1.100:8123/api/", + "HASS_API_PASSWORD": "passwordforHASS", + "CREDENTIALS": "admin:password", + "ALLOWED_NETWORKS": [], + "BANNED_IPS": [], + "BANLIMIT": 0, + "IGNORE_PATTERN": [".*", "*.log", "*.db"], + "DIRSFIRST": true, + "SESAME": null, + "VERIFY_HOSTNAME": null +} From 2a06b8278f0a8508fdead72b61e5277f54591e75 Mon Sep 17 00:00:00 2001 From: Stefan Larsen <33205551+bloody2k@users.noreply.github.com> Date: Tue, 21 Jan 2020 21:15:16 +0100 Subject: [PATCH 10/20] Create config.json Add config for valetudomap --- .templates/valetudomap/config.json | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .templates/valetudomap/config.json diff --git a/.templates/valetudomap/config.json b/.templates/valetudomap/config.json new file mode 100644 index 00000000..ac6bd416 --- /dev/null +++ b/.templates/valetudomap/config.json @@ -0,0 +1,23 @@ +{ + "mqtt": { + "identifier": "rockrobo", + "topicPrefix": "valetudo", + "autoconfPrefix": "homeassistant", + "broker_url": "mqtt://user:passwork@192.168.xxx.xxx", + "caPath": "", + "mapSettings": { + "drawPath": true, + "drawCharger": true, + "drawRobot": true, + "border": 2, + "scale": 4 + }, + "mapDataTopic": "valetudo/rockrobo/map_data", + "minMillisecondsBetweenMapUpdates": 10000, + "publishMapImage": true + }, + "webserver": { + "enabled": false, + "port": 3000 + } +} From 0c0746c44ffc7e40dc9e775306bc58bd10540d3b Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 23 Feb 2020 14:57:26 +0100 Subject: [PATCH 11/20] Optional port for Duplicati --- .templates/duplicati/service.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.templates/duplicati/service.yml b/.templates/duplicati/service.yml index 5642f9b6..b8ebb44d 100644 --- a/.templates/duplicati/service.yml +++ b/.templates/duplicati/service.yml @@ -3,6 +3,8 @@ restart: unless-stopped image: lsioarmhf/duplicati network_mode: host + #ports: + # - 8200:8200 volumes: - /:/source - ./volumes/duplicati:/config From 965bab0028eb1446828d53bf6cb05c7b37f16a38 Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 23 Feb 2020 14:57:26 +0100 Subject: [PATCH 12/20] Duplicati and HomeAssistant selectable through menu --- menu.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/menu.sh b/menu.sh index 074f661e..d030143f 100755 --- a/menu.sh +++ b/menu.sh @@ -8,6 +8,8 @@ declare -A cont_array=( [nodered]="Node-RED" [influxdb]="InfluxDB" [telegraf]="Telegraf (Requires InfluxDB and Mosquitto)" + [duplicati]="duplicati" + [homeassistant]="homeassistant" [grafana]="Grafana" [mosquitto]="Eclipse-Mosquitto" [postgres]="Postgres" @@ -30,7 +32,7 @@ declare -A cont_array=( [python]="Python 3" ) -declare -a armhf_keys=("portainer" "nodered" "influxdb" "grafana" "mosquitto" "telegraf" "mariadb" "postgres" +declare -a armhf_keys=("portainer" "nodered" "influxdb" "grafana" "mosquitto" "telegraf" "duplicati" "homeassistant" "mariadb" "postgres" "adminer" "openhab" "zigbee2mqtt" "pihole" "plex" "tasmoadmin" "rtl_433" "espruinohub" "motioneye" "webthings_gateway" "blynk_server" "nextcloud" "diyhue" "homebridge" "python") From c587bf6ca6c46aacd2d3ccaeba890e09d5092cdf Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 23 Feb 2020 14:57:26 +0100 Subject: [PATCH 13/20] HomeAssistant new service --- .templates/homeassistant/service.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .templates/homeassistant/service.yml diff --git a/.templates/homeassistant/service.yml b/.templates/homeassistant/service.yml new file mode 100644 index 00000000..e6049f0c --- /dev/null +++ b/.templates/homeassistant/service.yml @@ -0,0 +1,9 @@ + homeassistant: + container_name: home-assistant + image: homeassistant/raspberrypi4-homeassistant + volumes: + - ./volumes/homeassistant:/config' + environment: + - TZ=Europe/Rome + restart: always + network_mode: host From ccf00ec9c7a502a633ccdbb5a40da542a78f27d8 Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 23 Feb 2020 16:39:12 +0100 Subject: [PATCH 14/20] Switch to linuxserver/duplicati --- .templates/duplicati/service.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.templates/duplicati/service.yml b/.templates/duplicati/service.yml index b8ebb44d..af7575ba 100644 --- a/.templates/duplicati/service.yml +++ b/.templates/duplicati/service.yml @@ -1,11 +1,17 @@ duplicati: container_name: Duplicati restart: unless-stopped - image: lsioarmhf/duplicati + image: linuxserver/duplicati network_mode: host + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/London #ports: # - 8200:8200 volumes: + - /etc:/etc_host + - /home/pi/Scripts:/pi_scripts - /:/source - ./volumes/duplicati:/config - /etc/localtime:/etc/localtime:ro From 92501e796a569b4f20c1a1d39c1729849f611746 Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 23 Feb 2020 17:13:04 +0100 Subject: [PATCH 15/20] Secure Portainer access --- .templates/portainer/service.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.templates/portainer/service.yml b/.templates/portainer/service.yml index b7bd194a..07ad1af1 100644 --- a/.templates/portainer/service.yml +++ b/.templates/portainer/service.yml @@ -3,7 +3,13 @@ image: portainer/portainer restart: unless-stopped ports: - - 9000:9000 + # - 9000:9000 + - 9443:9000 volumes: + - /etc/0_scripts:/certs - /var/run/docker.sock:/var/run/docker.sock - ./volumes/portainer/data:/data + command: + --ssl + --sslcert /certs/portainer.crt + --sslkey /certs/portainer.key From 38396b72ce3e1425c5526aca64f654a42cc7959a Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 23 Feb 2020 22:22:43 +0100 Subject: [PATCH 16/20] Change timezone --- .templates/duplicati/service.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.templates/duplicati/service.yml b/.templates/duplicati/service.yml index af7575ba..44e492b0 100644 --- a/.templates/duplicati/service.yml +++ b/.templates/duplicati/service.yml @@ -6,7 +6,7 @@ environment: - PUID=1000 - PGID=1000 - - TZ=Europe/London + - TZ=Europe/Rome #ports: # - 8200:8200 volumes: From 220636882d714585f537afee5521f909efb665fe Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 23 Feb 2020 22:22:58 +0100 Subject: [PATCH 17/20] Fix wrong path --- .templates/homeassistant/service.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.templates/homeassistant/service.yml b/.templates/homeassistant/service.yml index e6049f0c..669bdd6e 100644 --- a/.templates/homeassistant/service.yml +++ b/.templates/homeassistant/service.yml @@ -2,7 +2,7 @@ container_name: home-assistant image: homeassistant/raspberrypi4-homeassistant volumes: - - ./volumes/homeassistant:/config' + - ./volumes/homeassistant:/config environment: - TZ=Europe/Rome restart: always From 4d7042d4810973eeb25d9117c48967c24b7b0f08 Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 23 Feb 2020 22:24:36 +0100 Subject: [PATCH 18/20] Added paths to avoid source and backup volumes outside IOTstack folder --- .templates/duplicati/service.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.templates/duplicati/service.yml b/.templates/duplicati/service.yml index 44e492b0..9fd38d8d 100644 --- a/.templates/duplicati/service.yml +++ b/.templates/duplicati/service.yml @@ -12,7 +12,9 @@ volumes: - /etc:/etc_host - /home/pi/Scripts:/pi_scripts - - /:/source + - /home/pi/IOTstack/volumes:/iot_stack_volumes + - ./volumes/duplicati_source:/source + - ./volumes/duplicati_backups:/backups - ./volumes/duplicati:/config - /etc/localtime:/etc/localtime:ro From 0ddd25bd2a47478991774be34fe6be7f5d932c73 Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Wed, 4 Mar 2020 23:23:42 +0100 Subject: [PATCH 19/20] recent duplicati and mosquitto changes --- .templates/duplicati/service.yml | 6 +++--- .templates/mosquitto/service.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.templates/duplicati/service.yml b/.templates/duplicati/service.yml index 9fd38d8d..fdeb1e66 100644 --- a/.templates/duplicati/service.yml +++ b/.templates/duplicati/service.yml @@ -1,5 +1,5 @@ duplicati: - container_name: Duplicati + container_name: duplicati restart: unless-stopped image: linuxserver/duplicati network_mode: host @@ -7,8 +7,8 @@ - PUID=1000 - PGID=1000 - TZ=Europe/Rome - #ports: - # - 8200:8200 + ports: + - 8200:8200 volumes: - /etc:/etc_host - /home/pi/Scripts:/pi_scripts diff --git a/.templates/mosquitto/service.yml b/.templates/mosquitto/service.yml index 8a62d776..d3bc56bc 100644 --- a/.templates/mosquitto/service.yml +++ b/.templates/mosquitto/service.yml @@ -4,8 +4,8 @@ restart: unless-stopped user: "1883" ports: - - 1883:1883 - - 9001:9001 + - '1883:1883' + - '9001:9001' volumes: - ./volumes/mosquitto/data:/mosquitto/data - ./volumes/mosquitto/log:/mosquitto/log From 103a9aa60bfd1645b8dd65619057f886cb1b01af Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 22 Mar 2020 15:20:29 +0100 Subject: [PATCH 20/20] Standard duplicati path --- .templates/duplicati/service.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.templates/duplicati/service.yml b/.templates/duplicati/service.yml index fdeb1e66..887e0ae5 100644 --- a/.templates/duplicati/service.yml +++ b/.templates/duplicati/service.yml @@ -10,11 +10,7 @@ ports: - 8200:8200 volumes: - - /etc:/etc_host - - /home/pi/Scripts:/pi_scripts - - /home/pi/IOTstack/volumes:/iot_stack_volumes - - ./volumes/duplicati_source:/source - - ./volumes/duplicati_backups:/backups + - /:/source - ./volumes/duplicati:/config - /etc/localtime:/etc/localtime:ro