Compare revisions

Jannik Berges · Jannik Berges · jabertwo · jabertwo · jabertwo · jabertwo
--- a/common/crowdsec/tasks/main.yml
+++ b/common/crowdsec/tasks/main.yml
--- a/common/docker_traefik/tasks/main.yml
+++ b/common/docker_traefik/tasks/main.yml

- include: ../functions/get_secret.yml
+- include_tasks: ../functions/get_secret.yml
  with_items:
    - { path: "{{ basedir }}/letsencrypt_notification_email",  length: -1 }
  when: selfSignedCN is not defined 

--- a/group_vars/prod
+++ b/group_vars/prod
@@ -32,40 +32,40 @@ global_domains:
 # Globale Mail konfiguration 
 mail_domains:
  warpzonems:
-    maildomain: warpzone.ms 
-    mxserver: mailserver.warpzone.ms
-    mxhostname: webserver
-    spf: "v=spf1 mx a:{{ mail_domains.warpzonems.mxserver }} ip4:{{ hostvars['webserver'].ext_ip4 }} ip6:{{ hostvars['webserver'].ext_ip6 }} -all"
+    maildomain: "warpzone.ms" 
+    mxserver: "mailserver.warpzone.ms"
+    mxhostname: "webserver"
+    spf: "v=spf1 mx a:mailserver.warpzone.ms ip4:{{ hostvars['webserver'].ext_ip4 }} ip6:{{ hostvars['webserver'].ext_ip6 }} -all"
    dmarc: "v=DMARC1; p=none;"
    dkim:
      - { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxNnNZElbWq9EonFULbr8vWWykKmZEylRwjo4lYx/lXsGDFWBuNh2s6gFF10OuHWtavokjvh/7sFidNaRYQkn3uwHmylBWFn7Jr2lPWY8PBEoIeAZZx5qHaDWxJVgzE7maFyXAswDGXcR/DRTn2xR6osNXOovjGeYXq/atR/45iwfgkhqAaXaV1uP/K9y\" \"y2sZ2dRtGEwCKsWbP26cOZ6MUcADszgUTEp59iKey79m0uwi0IpA8WjEKVwbMcf/6fBw1ejIEjVUX+bami2fQ6RPl4uEyloco4paV3w/vww2hh4VchCFLYAEKMkZOZs/eTDGsjaMguwHbPeVJjkpX2T6WQIDAQAB" }
  member_warpzonems:
-    maildomain: "member.{{ mail_domains.warpzonems.maildomain }}" 
-    mxserver: "{{ mail_domains.warpzonems.mxserver }}"
-    mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
-    spf: "{{ mail_domains.warpzonems.spf }}"
+    maildomain: "member.warpzone.ms" 
+    mxserver: "mailserver.warpzone.ms"
+    mxhostname: "webserver"
+    spf: "v=spf1 mx a:mailserver.warpzone.ms ip4:{{ hostvars['webserver'].ext_ip4 }} ip6:{{ hostvars['webserver'].ext_ip6 }} -all"
    dkim:
      - { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu334a+uJ5b7D8UTz3Up6A8EjZhEnXaIpiIcKAGPXXD2ZBGmkWfUNcwDcfMoDErH6ntXzf0uH2VMvaajB/wdKLyly1irDKoyjLA3hJb5wnF9Gh0anL1qxY6UA189vWsw+2JlZJWyQ3IcaQ720SM3OrrK4AL3gRItieSEQ+23m5aW0P6sgUuMXTmmKLbd4\" \"DzZ14Emw293TD2p4gJtgxW/6EfIfcUU+/jP1NNm9gksyzynH1pJXPwVruo9u4QujEQiPqtVsVtrtUm1kbnW+pexj3eKOLLEHGZ+p5AZ/jtALk9pJfNumm/XHFK5PTZDBIipXOYvuG8RdwsaCQRezGKy04QIDAQAB" }
  lists_warpzonems:
-    maildomain: "lists.{{ mail_domains.warpzonems.maildomain }}" 
-    mxserver: "{{ mail_domains.warpzonems.mxserver }}"
-    mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
-    spf: "{{ mail_domains.warpzonems.spf }}"
+    maildomain: "lists.warpzone.ms" 
+    mxserver: "mailserver.warpzone.ms"
+    mxhostname: "webserver"
+    spf: "v=spf1 mx a:mailserver.warpzone.ms ip4:{{ hostvars['webserver'].ext_ip4 }} ip6:{{ hostvars['webserver'].ext_ip6 }} -all"
    dkim:
      - { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoO7SXkUkM17Y1Vi/cvO48IJmlReGWSaYHY+wEldLHt80TiXP0AGZ8nG+DshXi1J2D5xjn8cJu4VqgDrLFnsRJyGYKmi7yVukANVg6gjYlET4y5+UU7Vk2W3xhN2U/8F0rcyynALzQa8i4Y/wEI0qkgHyE6+lITmglJvlj6tgp4YYK2TBH3Zo//PukOmU\" \"6gG/qu0+6p+CepvqzfGT2l1duov5a2+DJJzlJTULJ5D5Blsmg/0GeC81gZ4QDC3S8aaM5Pw3I3lQCSJT4Q4Ge6Ues4ccagNrdnZhtHNaVFGdL1mR1k+G784gpMZphPj5MylNEpA3V4bD7/Ygf4GuAvHdMwIDAQAB" }
 #  chaostreffmuensterde:
 #    maildomain: chaostreff-muenster.de 
-#    mxserver: "{{ mail_domains.warpzonems.mxserver }}"
-#    mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
-#    spf: "{{ mail_domains.warpzonems.spf }}"
+#    mxserver: "mailserver.warpzone.ms"
+#    mxhostname: "webserver"
+#    spf: "v=spf1 mx a:mailserver.warpzone.ms ip4:{{ hostvars['webserver'].ext_ip4 }} ip6:{{ hostvars['webserver'].ext_ip6 }} -all"
 #    dmarc: v=DMARC1; p=none;
 #    dkim:
 #      - { selector: "dkim", value: "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz/OBnxYygjhKeZVyvhDAO1/O1XwyYEhQx3bW/rO/Wmp8ZzP/eQh3dljDEibj1KsfdUhfgTIU8CnTKLayb8B07MMzhBklpg8WUV2LrDmpndfhixizjaxzwBj/dhtiZE7e4BwhOPOmdBQ0cCIvNhMcQcCa1RgCpX/g5Ii0AtQ2zCPMTSOW5YWn+VY" }
 #  lists_chaostreffmuensterde:
-#    maildomain: "lists.{{ mail_domains.chaostreffmuensterde.maildomain }}"
-#    mxserver: "{{ mail_domains.chaostreffmuensterde.mxserver }}"
-#    mxhostname: "{{ mail_domains.chaostreffmuensterde.mxhostname }}"
-#    spf: "{{ mail_domains.chaostreffmuensterde.spf }}"
+#    maildomain: "lists.chaostreff-muenster.de"
+#    mxserver: "mailserver.warpzone.ms"
+#    mxhostname: "webserver"
+#    spf: "v=spf1 mx a:mailserver.warpzone.ms ip4:{{ hostvars['webserver'].ext_ip4 }} ip6:{{ hostvars['webserver'].ext_ip6 }} -all"
 #    dmarc: v=DMARC1; p=none;


@@ -114,8 +114,9 @@ esphome_devices:
  - { id: "status",        name: "Status/Strom",  groups: "gHauptraum",     sensors: [ "stromverbrauch", "warpzone_status" ] }
  - { id: "vortragsraum",  name: "Vortragsraum",  groups: "gVortragsraum",  sensors: [ "Temp", "pressure", "humidity" ] }

-#Global Homematic configuration 
-homematic:
-  ccu2_host: 192.168.0.15
+# Global eQ3 Max configuration 
+eq3max:
+  cube_host: 192.168.0.15
  devices_heizung:
-    - { name: "HeizungKlo", id: "OEQ0663079" }
+    - { name: "E-Werkstatt-Mitte", id: "MEQ1814738" }
+#    - { name: "HeizungKlo", id: "OEQ0663079" }
--- a/host_vars/carrot
+++ b/host_vars/carrot
@@ -6,9 +6,9 @@ motd_lines:
  - "Haupt-IP @ eth0: {{ansible_eth0.ipv4.address}}"

 debian_sources:
-  - "deb http://ftp2.de.debian.org/debian/ bullseye main contrib non-free"
-  - "deb http://ftp.debian.org/debian bullseye-updates main contrib non-free"
-  - "deb http://security.debian.org/ bullseye-security main contrib non-free"
+  - "deb http://ftp2.de.debian.org/debian/ bookworm main contrib non-free"
+  - "deb http://ftp.debian.org/debian bookworm-updates main contrib non-free"
+  - "deb http://security.debian.org/ bookworm-security main contrib non-free"

 debian_keys_id:


--- a/host_vars/hex
+++ b/host_vars/hex
@@ -6,15 +6,15 @@ motd_lines:
  - "IPs: {{ansible_vmbr0.ipv4.address}}"

 debian_sources: 
-  - "deb http://deb.debian.org/debian/ bullseye main non-free contrib"
-  - "deb http://security.debian.org/debian-security bullseye-security main contrib non-free"
-  - "deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free"
-  - "deb http://download.proxmox.com/debian/pve bullseye pve-no-subscription"
+  - "deb http://deb.debian.org/debian/ bookworm main non-free contrib"
+  - "deb http://security.debian.org/debian-security bookworm-security main contrib non-free"
+  - "deb http://deb.debian.org/debian/ bookworm-updates main contrib non-free"
+  - "deb http://download.proxmox.com/debian/pve bookworm pve-no-subscription"

 debian_keys_id:

 debian_keys_url:
-  - "https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg"
+  - "https://enterprise.proxmox.com/debian/proxmox-release-bookworm.gpg"


 # Art des Hosts: physical, vm, docker 

--- a/host_vars/hix
+++ b/host_vars/hix
@@ -6,10 +6,10 @@ motd_lines:
  - "Haupt-IP @ eth0: {{ansible_eth0.ipv4.address}}"

 debian_sources:
-  - "deb http://ftp2.de.debian.org/debian/ bullseye main contrib non-free"
-  - "deb http://ftp.debian.org/debian bullseye-updates main contrib non-free"
-  - "deb http://security.debian.org/ bullseye-security main contrib non-free"
-  - "deb https://download.docker.com/linux/debian bullseye stable"
+  - "deb http://ftp2.de.debian.org/debian/ bookworm main contrib non-free"
+  - "deb http://ftp.debian.org/debian bookworm-updates main contrib non-free"
+  - "deb http://security.debian.org/ bookworm-security main contrib non-free"
+  - "deb https://download.docker.com/linux/debian bookworm stable"

 debian_keys_id:


--- a/host_vars/ogg
+++ b/host_vars/ogg
@@ -6,10 +6,10 @@ motd_lines:
  - "Haupt-IP @ eth0: {{ansible_eth0.ipv4.address}}"

 debian_sources:
-  - "deb http://ftp2.de.debian.org/debian/ bullseye main contrib non-free"
-  - "deb http://ftp.debian.org/debian bullseye-updates main contrib non-free"
-  - "deb http://security.debian.org/ bullseye-security main contrib non-free"
-  - "deb https://download.docker.com/linux/debian bullseye stable"
+  - "deb http://ftp2.de.debian.org/debian/ bookworm main contrib non-free"
+  - "deb http://ftp.debian.org/debian bookworm-updates main contrib non-free"
+  - "deb http://security.debian.org/ bookworm-security main contrib non-free"
+  - "deb https://download.docker.com/linux/debian bookworm stable"

 debian_keys_id:

@@ -63,9 +63,6 @@ alert:
    - { name: "heimdall_app_1" }    
    - { name: "homeassistant_app_1" }    
    - { name: "homeassistant_influxdb_1" }    
-    - { name: "homematic_app_1" }    
-    - { name: "homematic_influxdb_1" }    
-    - { name: "homematic_telegraf_1" }    
    - { name: "mqtt_app_1" } 
    - { name: "mqtt_influxdb_1" } 
    - { name: "mqtt_tgbinary_1" } 

--- a/host_vars/tiffany
+++ b/host_vars/tiffany
@@ -6,15 +6,15 @@ motd_lines:
  - "Öffentliche IPs: {{ansible_enp35s0.ipv4.address}} / {{ansible_enp35s0.ipv6[0].address}}"

 debian_sources: 
-  - "deb http://ftp2.de.debian.org/debian/ bullseye main contrib non-free"
-  - "deb http://ftp.debian.org/debian bullseye-updates main contrib non-free"
-  - "deb http://security.debian.org/ bullseye-security main contrib non-free"
-  - "deb http://download.proxmox.com/debian/pve bullseye pve-no-subscription"
+  - "deb http://ftp2.de.debian.org/debian/ bookworm main contrib non-free"
+  - "deb http://ftp.debian.org/debian bookworm-updates main contrib non-free"
+  - "deb http://security.debian.org/ bookworm-security main contrib non-free"
+  - "deb http://download.proxmox.com/debian/pve bookworm pve-no-subscription"

 debian_keys_id:

 debian_keys_url:
-  - "http://download.proxmox.com/debian/proxmox-release-bullseye.gpg"
+  - "http://download.proxmox.com/debian/proxmox-release-bookworm.gpg"


 # Art des Hosts: physical, vm, docker 

--- a/host_vars/verwaltung
+++ b/host_vars/verwaltung
@@ -6,10 +6,10 @@ motd_lines:
  - "Öffentliche IPs: {{ansible_ens18.ipv4.address}} / {{ansible_ens18.ipv6[0].address}}"

 debian_sources: 
-  - "deb http://ftp2.de.debian.org/debian/ bullseye main contrib non-free"
-  - "deb http://ftp.debian.org/debian bullseye-updates main contrib non-free"
-  - "deb http://security.debian.org/ bullseye-security main contrib non-free"
-  - "deb https://download.docker.com/linux/debian bullseye stable"
+  - "deb http://ftp2.de.debian.org/debian/ bookworm main contrib non-free"
+  - "deb http://ftp.debian.org/debian bookworm-updates main contrib non-free"
+  - "deb http://security.debian.org/ bookworm-security main contrib non-free"
+  - "deb https://download.docker.com/linux/debian bookworm stable"

 debian_keys_id:
  

--- a/host_vars/weatherwax
+++ b/host_vars/weatherwax
@@ -6,15 +6,15 @@ motd_lines:
  - "IPs: {{ansible_bond0.ipv4.address}}"

 debian_sources: 
-  - "deb http://deb.debian.org/debian/ bullseye main non-free contrib"
-  - "deb http://security.debian.org/debian-security bullseye-security main contrib non-free"
-  - "deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free"
-  - "deb http://download.proxmox.com/debian/pve bullseye pve-no-subscription"
+  - "deb http://deb.debian.org/debian/ bookworm main non-free contrib"
+  - "deb http://security.debian.org/debian-security bookworm-security main contrib non-free"
+  - "deb http://deb.debian.org/debian/ bookworm-updates main contrib non-free"
+  - "deb http://download.proxmox.com/debian/pve bookworm pve-no-subscription"

 debian_keys_id:

 debian_keys_url:
-  - "https://enterprise.proxmox.com/debian/proxmox-release-bullseye.gpg"
+  - "https://enterprise.proxmox.com/debian/proxmox-release-bookworm.gpg"


 # Art des Hosts: physical, vm, docker 

--- a/host_vars/webserver
+++ b/host_vars/webserver
@@ -6,10 +6,10 @@ motd_lines:
  - "Öffentliche IPs: {{ansible_ens18.ipv4.address}} / {{ansible_ens18.ipv6[0].address}}"

 debian_sources: 
-  - "deb http://ftp2.de.debian.org/debian/ bullseye main contrib non-free"
-  - "deb http://ftp.debian.org/debian bullseye-updates main contrib non-free"
-  - "deb http://security.debian.org/ bullseye-security main contrib non-free"
-  - "deb https://download.docker.com/linux/debian bullseye stable"
+  - "deb http://ftp2.de.debian.org/debian/ bookworm main contrib non-free"
+  - "deb http://ftp.debian.org/debian bookworm-updates main contrib non-free"
+  - "deb http://security.debian.org/ bookworm-security main contrib non-free"
+  - "deb https://download.docker.com/linux/debian bookworm stable"

 debian_keys_id:


--- a/intern/docker_esphome/templates/config/esphome_plug02.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug02.yaml
@@ -19,6 +19,10 @@
      payload: "CLOSED"
      then:
        - switch.turn_off: relay
+    - topic: warpzone/door/status_once
+      payload: "OPEN"
+      then:
+        - switch.turn_on: relay

 status_led:
  pin:

--- a/intern/docker_esphome/templates/config/esphome_plug03.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug03.yaml
@@ -19,6 +19,10 @@
      payload: "CLOSED"
      then:
        - switch.turn_off: relay
+    - topic: warpzone/door/status_once
+      payload: "OPEN"
+      then:
+        - switch.turn_on: relay

 status_led:
  pin:

--- a/intern/docker_esphome/templates/config/esphome_plug04.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug04.yaml
@@ -3,7 +3,7 @@
 {% include "/includes/ansible.inc.yaml" %}
 {% include "/includes/board.esp01_1m.inc.yaml" %}

-  comment: Halogen Lounge
+  comment: frei
 {% include "/includes/common.inc.yaml" %}

  on_message:

--- a/intern/docker_esphome/templates/config/esphome_plug07.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug07.yaml
@@ -19,6 +19,10 @@
      payload: "CLOSED"
      then:
        - switch.turn_off: relay
+    - topic: warpzone/door/status_once
+      payload: "OPEN"
+      then:
+        - switch.turn_on: relay
        
 substitutions:
  plug_name: {{ devicename }}

--- a/intern/docker_esphome/templates/config/esphome_plug08.yaml
+++ b/intern/docker_esphome/templates/config/esphome_plug08.yaml
@@ -3,7 +3,7 @@
 {% include "/includes/ansible.inc.yaml" %}
 {% include "/includes/board.esp01_1m.inc.yaml" %}

-  comment: 3D Drucker Prusanet
+  comment: WLED Vorhang
 {% include "/includes/common.inc.yaml" %}

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

--- a/intern/docker_esphome/templates/config/esphome_popcorn.yaml
+++ b/intern/docker_esphome/templates/config/esphome_popcorn.yaml
@@ -135,7 +135,7 @@ climate:
    id: pid_heater
    name: "PID Heater Controller"
    sensor: pot_sensor
-    default_target_temperature: 240
+    default_target_temperature: 220
    heat_output: pot_heater
    control_parameters:
      kp: 0.09549

--- a/intern/docker_homeassistant/tasks/main.yml
+++ b/intern/docker_homeassistant/tasks/main.yml
 ---

- include: ../functions/get_secret.yml
+- include_tasks: ../functions/get_secret.yml
  with_items:
   - { path: "{{ basedir }}/warpai_status_update_key",     length: -1 }
   - { path: "{{ basedir }}/homeassistant_admin_password", length: 12 }

--- a/intern/docker_homeassistant/templates/config/configuration.yaml
+++ b/intern/docker_homeassistant/templates/config/configuration.yaml
--- a/intern/docker_homematic/tasks/main.yml
+++ b/intern/docker_homematic/tasks/main.yml
---
-
- include: ../functions/get_secret.yml
-  with_items:
-   - { path: "{{ basedir }}/influxdb_password",            length: 12 }
-   - { path: "{{ basedir }}/influxdb_token",               length: 32 }
-
-
- name: "create folder struct for {{ basedir }}"
-  file: 
-    path: "{{ item }}"
-    state: "directory"
-  with_items:
-    - "{{ basedir }}"
-
-
- name: "copy config files for {{ basedir }}"
-  template:
-    src: "{{ item }}"
-    dest: "{{ basedir }}/{{ item }}"
-  with_items:
-    - docker-compose.yml
-    - telegraf.conf
-  register: config_files
-
-
- name: "stop {{ servicename }} docker"
-  docker_compose:
-    project_src: "{{ basedir }}"
-    state: absent
-  when: config_files.changed 
-
-
- name: "start {{ servicename }} docker"
-  docker_compose:
-    project_src: "{{ basedir }}"
-    state: present
No results found