common/docker/templates/daemon.json

@@ -6,7 +6,7 @@
       "max-file": "5"
     },
     "metrics-addr": "{{int_ip4}}:9323",
-    "experimental": true
-
+    "experimental": true,
+    "ip6tables": true
 }
 

common/docker_traefik/tasks/main.yml

@@ -37,11 +37,19 @@
     dest: "{{ basedir }}/{{ item }}"
   with_items:
     - docker-compose.yml
-    - traefik.yml 
-    - dynamic/redirect-default.yml
+    - traefik.yml
     - dynamic/tls.yml
   register: config
 
+- name: redirect-default ersstellen, wenn domain_default definiert ist
+  template:
+    src: "{{ item }}"
+    dest: "{{ basedir }}/{{ item }}"
+  with_items:
+    - dynamic/redirect-default.yml
+  when: domain_default is defined
+  register: config
+
 - name: "stop {{ servicename}} docker"
   docker_compose:
     project_src: "{{ basedir }}"

common/docker_traefik/templates/docker-compose.yml

@@ -3,7 +3,7 @@ version: '2.4'
 services:
 
     app:
-        image: traefik:v2.9.8
+        image: traefik:v3.0
         restart: always
         ports:
             - "80:80"

common/docker_traefik/templates/dynamic/tls.yml

@@ -14,7 +14,6 @@ tls:
     options:
         default:
             sniStrict: true
-            preferServerCipherSuites: true
             minVersion: "VersionTLS12"
             curvePreferences:
                 - "secp521r1"

group_vars/prod

@@ -35,37 +35,37 @@ mail_domains:
     maildomain: warpzone.ms 
     mxserver: mailserver.warpzone.ms
     mxhostname: webserver
-    spf: "v=spf1 mx a:mailserver.warpzone.ms ~all"
-    dmarc: v=DMARC1; p=none;
+    spf: "v=spf1 mx a:{{ mail_domains.warpzonems.mxserver }} 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.warpzone.ms 
-    mxserver: mailserver.warpzone.ms
-    mxhostname: webserver
-    spf: "v=spf1 mx a:mailserver.warpzone.ms ~all"
+    maildomain: "member.{{ mail_domains.warpzonems.maildomain }}" 
+    mxserver: "{{ mail_domains.warpzonems.mxserver }}"
+    mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
+    spf: "{{ mail_domains.warpzonems.spf }}"
     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.warpzone.ms 
-    mxserver: mailserver.warpzone.ms
-    mxhostname: webserver
-    spf: "v=spf1 mx a:mailserver.warpzone.ms ~all"
+    maildomain: "lists.{{ mail_domains.warpzonems.maildomain }}" 
+    mxserver: "{{ mail_domains.warpzonems.mxserver }}"
+    mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
+    spf: "{{ mail_domains.warpzonems.spf }}"
     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: mailserver.warpzone.ms
-#    mxhostname: webserver
-#    spf: v=spf1 mx ~all
+#    mxserver: "{{ mail_domains.warpzonems.mxserver }}"
+#    mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
+#    spf: "{{ mail_domains.warpzonems.spf }}"
 #    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.chaostreff-muenster.de 
-#    mxserver: mailserver.warpzone.ms
-#    mxhostname: webserver
-#    spf: v=spf1 mx ~all
+#    maildomain: "lists.{{ mail_domains.chaostreffmuensterde.maildomain }}"
+#    mxserver: "{{ mail_domains.chaostreffmuensterde.mxserver }}"
+#    mxhostname: "{{ mail_domains.chaostreffmuensterde.mxhostname }}"
+#    spf: "{{ mail_domains.chaostreffmuensterde.spf }}"
 #    dmarc: v=DMARC1; p=none;
 
 

host_vars/carrot

@@ -35,8 +35,8 @@ administratorenteam:
 # Monitoring aktivieren
 alert:
   load:
-    warn: 5
-    crit: 10
+    warn: 10
+    crit: 20
   disks:
     - { mountpoint: "/", warn: "5 GB", crit: "1 GB" }
 

host_vars/ogg

@@ -49,8 +49,8 @@ docker:
 # Monitoring aktivieren
 alert:
   load:
-    warn: 5
-    crit: 10
+    warn: 10
+    crit: 20
   containers:
     - { name: "dockerstats_app_1" }    
     - { name: "esphome_app_1" }    

host_vars/weatherwax

@@ -32,8 +32,8 @@ administratorenteam:
 # Monitoring aktivieren
 alert:
   load:
-    warn: 10
-    crit: 20
+    warn: 15
+    crit: 30
   disks:
     - { mountpoint: "/",         warn: "10 GB", crit: "3 GB" }
     # btrfs currently no data from node exporter 

site.yml

@@ -276,7 +276,6 @@
         servicename: traefik,
         basedir: /srv/traefik,
         domain: "warpzone.ms",
-        domain_default: "www.warpzone.ms" 
       }      
     - { 
         role: verwaltung/docker_gitea, tags: gitea,

webserver/docker_mail/templates/mailu.env

@@ -5,6 +5,9 @@
 # Set Version 
 MAILU_VERSION=2.0.4
 
+# enable IPv6
+SUBNET6=fd00:dead:beef:25::/64
+
 # Autocreate Admin User 
 INITIAL_ADMIN_ACCOUNT=mailadmin
 INITIAL_ADMIN_DOMAIN={{ domain }}