Merge branch 'master' of ssh://gitlab.warpzone.ms:444/infrastruktur/ansible-warpzone

common/docker/tasks/main.yml

@@ -7,6 +7,7 @@
     state: present
   vars:
     packages:
+      - apparmor
       - docker-ce
       - docker-compose
       - python3

intern/docker_esphome/templates/config/esphome_display02.yaml

@@ -27,6 +27,10 @@ external_components:
       payload: "OFF"
       then:
         - light.turn_off: matrix_light
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - light.turn_off: matrix_light
 
 light:
   - platform: monochromatic

intern/docker_esphome/templates/config/esphome_kuehlschrank.yaml

@@ -28,8 +28,8 @@
 {% include "/includes/common.inc.yaml" %}
 
   on_message:
-    - topic: ESPHome/{{ devicename }}/state/command
-      payload: "ON"
+    - topic: warpzone/door/status
+      payload: "OPEN"
       then:
         - light.turn_on: 
             id: logo_led
@@ -39,8 +39,8 @@
             id: kuehl_led
             effect: "Rainbow"
             brightness: 100%
-    - topic: ESPHome/{{ devicename }}/state/command
-      payload: "OFF"
+    - topic: warpzone/door/status
+      payload: "CLOSED"
       then:
         - light.turn_off: logo_led
         - light.turn_off: kuehl_led

intern/docker_esphome/templates/config/esphome_plug01.yaml

@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
 
 status_led:
   pin:

intern/docker_esphome/templates/config/esphome_plug02.yaml

@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
 
 status_led:
   pin:

intern/docker_esphome/templates/config/esphome_plug03.yaml

@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
 
 status_led:
   pin:

intern/docker_esphome/templates/config/esphome_plug04.yaml

@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
 
 status_led:
   pin:

intern/docker_esphome/templates/config/esphome_plug05.yaml

@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
         
 substitutions:
   plug_name: {{ devicename }}

intern/docker_esphome/templates/config/esphome_plug06.yaml

@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
         
 substitutions:
   plug_name: {{ devicename }}

intern/docker_esphome/templates/config/esphome_plug07.yaml

@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
         
 substitutions:
   plug_name: {{ devicename }}

intern/docker_esphome/templates/config/esphome_plug08.yaml

@@ -15,6 +15,10 @@
       payload: "OFF"
       then:
         - switch.turn_off: relay
+    - topic: warpzone/door/status
+      payload: "CLOSED"
+      then:
+        - switch.turn_off: relay
         
 substitutions:
   plug_name: {{ devicename }}

intern/docker_homeassistant/templates/config/configuration.yaml

@@ -59,7 +59,7 @@ binary_sensor:
     host: TL-SG3452X
     name: "Switch02"
     count: 3
-    scan_interval: 5 
+    scan_interval: 20 
 
 # https://www.home-assistant.io/integrations/rest_command/
 rest_command: 
@@ -96,7 +96,7 @@ input_select:
       - closed
     icon: mdi:door-open
 
-# current time for 
+# current time for zonenstatus telegram
 sensor:
   - platform: time_date
     display_options:
@@ -142,7 +142,7 @@ automation ansible:
                   option: closed
                 target:
                   entity_id: input_select.zonenstatus
-    mode: single
+    mode: restart
 
   # send zonenstatus to MQTT, REST
   - alias: ANSIBLE_zonenstatus_send_MQTT_REST
@@ -175,7 +175,7 @@ automation ansible:
             payload: CLOSED
         - service: rest_command.set_zone_status_closed
           data: {}
-    mode: single
+    mode: restart
 
   # send zonenstatus to telegram
   - alias: ANSIBLE_zonenstatus_send_telegram
@@ -207,4 +207,4 @@ automation ansible:
                   target: -1001893089134
                   timeout: 30
                   message: Die warpzone ist seit {{ '{{' }} states('sensor.time') {{ '}}' }} geschlossen!
-    mode: single
+    mode: restart

intern/docker_tasmoadmin/tasks/main.yml

+---
+- name: "create folder struct for {{ servicename }}"
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: "directory"
+    recurse: yes
+    owner: 1000
+    group: 1000
+  with_items:
+    - "{{ basedir }}/data/"
+
+- name: "copy config files file for {{ servicename }}"
+  ansible.builtin.template:
+    src: "{{ item }}"
+    dest: "{{ basedir }}/{{ item }}"
+    mode: '0755'
+  with_items:
+    - "docker-compose.yml"
+
+- name: "start {{ servicename }} with docker-compose"
+  community.docker.docker_compose:
+    state: present
+    project_src: "{{ basedir }}"

intern/docker_tasmoadmin/templates/docker-compose.yml

+
+version: "3"
+
+services:
+
+  app:
+    image: ghcr.io/tasmoadmin/tasmoadmin:latest
+    restart: always
+    volumes:
+      - "{{ basedir }}/data:/data"
+    environment:
+      - TZ=Europe/Berlin
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`)
+      - traefik.http.routers.{{ servicename }}.entrypoints=websecure
+      - traefik.http.services.{{ servicename }}.loadbalancer.server.port=80
+    networks:
+      - default
+      - web
+
+networks:
+  web:
+    external: true

site.yml

@@ -102,6 +102,12 @@
         basedir: /srv/graylog,
         domain: "graylog.warpzone.lan"
       }
+    - { 
+        role: intern/docker_tasmoadmin, tags: tasmoadmin, 
+        servicename: tasmoadmin,
+        basedir: /srv/tasmoadmin,
+        domain: "tasmoadmin.warpzone.lan"
+      }
 
 
 - hosts: webserver