diff --git a/intern/docker_esphome-dev/files/config/04B03.ttf b/intern/docker_esphome-dev/files/config/04B03.ttf deleted file mode 100644 index fe4328b6accff5ea1c2554ef0148814ff3203ca4..0000000000000000000000000000000000000000 Binary files a/intern/docker_esphome-dev/files/config/04B03.ttf and /dev/null differ diff --git a/intern/docker_esphome-dev/files/config/C64_Pro_Mono-STYLE.ttf b/intern/docker_esphome-dev/files/config/C64_Pro_Mono-STYLE.ttf deleted file mode 100644 index 02ff5fc4e805f747a61445a883c66c4872d8de9f..0000000000000000000000000000000000000000 Binary files a/intern/docker_esphome-dev/files/config/C64_Pro_Mono-STYLE.ttf and /dev/null differ diff --git a/intern/docker_esphome-dev/files/config/circle.gif b/intern/docker_esphome-dev/files/config/circle.gif deleted file mode 100644 index 307c83a5391cdf343f4190c3ba317adb12ab907d..0000000000000000000000000000000000000000 Binary files a/intern/docker_esphome-dev/files/config/circle.gif and /dev/null differ diff --git a/intern/docker_esphome-dev/files/config/frekvens-dot.ttf b/intern/docker_esphome-dev/files/config/frekvens-dot.ttf deleted file mode 100644 index 666bd31bcb55af2328baa5e51c1eb3feab405260..0000000000000000000000000000000000000000 Binary files a/intern/docker_esphome-dev/files/config/frekvens-dot.ttf and /dev/null differ diff --git a/intern/docker_esphome-dev/files/config/tall-pixel-8x3.ttf b/intern/docker_esphome-dev/files/config/tall-pixel-8x3.ttf deleted file mode 100644 index 55718c3f615875b476b26e72e20b135320336cf2..0000000000000000000000000000000000000000 Binary files a/intern/docker_esphome-dev/files/config/tall-pixel-8x3.ttf and /dev/null differ diff --git a/intern/docker_esphome-dev/files/config/tall-pixel-edit.ttf b/intern/docker_esphome-dev/files/config/tall-pixel-edit.ttf deleted file mode 100644 index 3120fd1642e0d04b6b60bfd1f265efe88cc8ba33..0000000000000000000000000000000000000000 Binary files a/intern/docker_esphome-dev/files/config/tall-pixel-edit.ttf and /dev/null differ diff --git a/intern/docker_esphome-dev/tasks/main.yml b/intern/docker_esphome-dev/tasks/main.yml deleted file mode 100644 index 045d2e4baef7f5bcaf520fd6ffcbf8ce68c383dd..0000000000000000000000000000000000000000 --- a/intern/docker_esphome-dev/tasks/main.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- - -- include_tasks: ../functions/get_secret.yml - with_items: - - { path: "{{ basedir }}/wlan_pass", length: -1 } - -- name: "create folder struct for {{ servicename }}" - file: - path: "{{ item }}" - state: "directory" - with_items: - - "{{ basedir }}/" - - "{{ basedir }}/config/" - - "{{ basedir }}/config/components/" - - "{{ basedir }}/config/components/frekvens_panel/" - -- name: "copy files for {{ servicename }}" - copy: - src: "{{ item }}" - dest: "{{ basedir }}/{{ item }}" - with_items: - - config/04B03.ttf - - config/C64_Pro_Mono-STYLE.ttf - - config/tall-pixel-8x3.ttf - - config/tall-pixel-edit.ttf - - config/frekvens-dot.ttf - register: config - -- name: "create config files for {{ servicename }}" - template: - src: "{{ item }}" - dest: "{{ basedir }}/{{ item }}" - with_items: - - docker-compose.yml - - compile.sh - register: config - -- name: "stop {{ servicename }} docker" - community.docker.docker_compose_v2: - project_src: "{{ basedir }}" - state: absent - when: config.changed - -- name: "start {{ servicename }} docker" - community.docker.docker_compose_v2: - project_src: "{{ basedir }}" - state: present diff --git a/intern/docker_esphome-dev/templates/compile.sh b/intern/docker_esphome-dev/templates/compile.sh deleted file mode 100644 index a06b87d4078ba241b00e7bad363fef036db319d9..0000000000000000000000000000000000000000 --- a/intern/docker_esphome-dev/templates/compile.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# Compile Image manual -# Usage: ./compile.sh <config.yml> -docker run --rm -v "{{ basedir }}/config:/config" -it esphome/esphome $1 compile diff --git a/intern/docker_esphome-dev/templates/docker-compose.yml b/intern/docker_esphome-dev/templates/docker-compose.yml deleted file mode 100644 index 9d71707d397afa8a910908dfbee83095506d8297..0000000000000000000000000000000000000000 --- a/intern/docker_esphome-dev/templates/docker-compose.yml +++ /dev/null @@ -1,22 +0,0 @@ -services: - - app: - - image: speckij/libretuya-esphome-amd64:latest - restart: always - volumes: - - "{{ basedir }}/config/:/config" - environment: - ESPHOME_DASHBOARD_USE_PING: "true" - labels: - - traefik.enable=true - - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`) - - traefik.http.routers.{{ servicename }}.entrypoints=websecure - - traefik.http.services.{{ servicename }}.loadbalancer.server.port=6052 - networks: - - default - - web - -networks: - web: - external: true diff --git a/intern/docker_esphome-dev/templates/includes/ansible.inc.yaml b/intern/docker_esphome-dev/templates/includes/ansible.inc.yaml deleted file mode 100644 index 3c89b6290f9aa2f0c1ca3fed416335bb160ec9ad..0000000000000000000000000000000000000000 --- a/intern/docker_esphome-dev/templates/includes/ansible.inc.yaml +++ /dev/null @@ -1,8 +0,0 @@ - -############################################################################## -## Wichtig: -## Diese Device-Konfiguration wird über Ansible verwaltet. -## Direkte Änderungen in ESPHome sind nur temporär und müssen anschließend -## in das Ansible Repo übernommen werden -## https://gitlab.warpzone.ms/infrastruktur/ansible-warpzone/-/blob/master/intern/docker_esphome/templates/config -############################################################################## diff --git a/intern/docker_esphome-dev/templates/includes/board.d1_mini.inc.yaml b/intern/docker_esphome-dev/templates/includes/board.d1_mini.inc.yaml deleted file mode 100644 index 37380ec38924886e7c01c988cb81cd78bb6ef934..0000000000000000000000000000000000000000 --- a/intern/docker_esphome-dev/templates/includes/board.d1_mini.inc.yaml +++ /dev/null @@ -1,5 +0,0 @@ - -esphome: - name: "{{ devicename }}" - platform: ESP8266 - board: d1_mini diff --git a/intern/docker_esphome-dev/templates/includes/board.esp01_1m.inc.yaml b/intern/docker_esphome-dev/templates/includes/board.esp01_1m.inc.yaml deleted file mode 100644 index bcb85cfffc585a508a55067f0fb924c5dfff84f3..0000000000000000000000000000000000000000 --- a/intern/docker_esphome-dev/templates/includes/board.esp01_1m.inc.yaml +++ /dev/null @@ -1,5 +0,0 @@ - -esphome: - name: "{{ devicename }}" - platform: ESP8266 - board: esp01_1m diff --git a/intern/docker_esphome-dev/templates/includes/board.esp32-doit-devkit-v1.inc.yaml b/intern/docker_esphome-dev/templates/includes/board.esp32-doit-devkit-v1.inc.yaml deleted file mode 100644 index e1aebd3589a13b69bbdb9854d125ff5ff999cbb8..0000000000000000000000000000000000000000 --- a/intern/docker_esphome-dev/templates/includes/board.esp32-doit-devkit-v1.inc.yaml +++ /dev/null @@ -1,5 +0,0 @@ - -esphome: - name: "{{ devicename }}" - platform: ESP32 - board: esp32doit-devkit-v1 diff --git a/intern/docker_esphome-dev/templates/includes/common.inc.yaml b/intern/docker_esphome-dev/templates/includes/common.inc.yaml deleted file mode 100644 index cf2ff845c66876b027ed9dde1cca675da8eb4446..0000000000000000000000000000000000000000 --- a/intern/docker_esphome-dev/templates/includes/common.inc.yaml +++ /dev/null @@ -1,35 +0,0 @@ - -# WiFi settings -wifi: - ssid: "Internet-of-Shit" - password: "{{ wlan_pass }}" - use_address: "{{ devicename }}.warpzone.lan" - - # Enable fallback hotspot (captive portal) in case wifi connection fails - ap: - ssid: "{{ devicename }}_fallback" - -# WLAN selection in fallback mode -captive_portal: - -# Enable OTA -ota: - -# Enable logging -logger: - level: DEBUG - -# Enable integrated WebServer -# local Option seems to be broken in version 2022.10.0 -# see: https://community.home-assistant.io/t/esphome-web-server-version-2-not-working/478034 -web_server: -# local: true - -# Activates prometheus /metrics endpoint -prometheus: - -# MQTT config -mqtt: - broker: 192.168.0.201 - discovery: false - topic_prefix: "ESPHome/{{ devicename }}" diff --git a/intern/docker_esphome-dev/templates/includes/common_info.inc.yaml b/intern/docker_esphome-dev/templates/includes/common_info.inc.yaml deleted file mode 100644 index cac792ee0c90894b009ec079a1f9b2565da8f827..0000000000000000000000000000000000000000 --- a/intern/docker_esphome-dev/templates/includes/common_info.inc.yaml +++ /dev/null @@ -1,37 +0,0 @@ - -# WiFi settings -wifi: - ssid: "Internet-of-Shit" - password: "{{ wlan_pass }}" - use_address: "{{ devicename }}.warpzone.lan" - - # Enable fallback hotspot (captive portal) in case wifi connection fails - ap: - ssid: "{{ devicename }}_fallback" - -# WLAN selection in fallback mode -captive_portal: - -# Enable OTA -ota: - -# Enable logging -logger: - level: INFO - logs: - sensor: INFO #fix for communication error with BME280 - -# Enable integrated WebServer -# local Option seems to be broken in version 2022.10.0 -# see: https://community.home-assistant.io/t/esphome-web-server-version-2-not-working/478034 -web_server: -# local: true - -# Activates prometheus /metrics endpoint -prometheus: - -# MQTT config -mqtt: - broker: 192.168.0.201 - discovery: false - topic_prefix: "ESPHome/{{ devicename }}" diff --git a/site.yml b/site.yml index b08e55951cca18adf361b5d220fc80201803350e..2debb6fa8102508ed92730f40f402d886d8b112e 100644 --- a/site.yml +++ b/site.yml @@ -173,12 +173,6 @@ basedir: /srv/esphome, domain: "esphome.warpzone.lan" } - - { - role: intern/docker_esphome-dev, tags: [ esphome-dev, docker_services ], - servicename: esphome-dev, - basedir: /srv/esphome-dev, - domain: "esphome-dev.warpzone.lan" - } - { role: intern/docker_grafana, tags: [ grafana, docker_services ], servicename: grafana,