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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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/10] 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 + } +}