webserver/docker_autodiscover/templates/docker-compose.yml

-version: '2.1'
-
-services:
-
-{% for domain in mail_domains %}
-
-  {{ domain }}:
-    image: monogramm/autodiscover-email-settings:1.4.0
-    restart: always
-    environment:
-      - DOMAIN={{ mail_domains[domain].maildomain }}
-      - IMAP_HOST={{ mail_domains[domain].mxserver }}
-      - IMAP_PORT=993
-      - IMAP_SOCKET=SSL
-      - POP_HOST={{ mail_domains[domain].mxserver }}
-      - POP_PORT=995
-      - POP_SOCKET=SSL
-      - SMTP_HOST={{ mail_domains[domain].mxserver }}
-      - SMTP_PORT=587
-      - SMTP_SOCKET=STARTTLS
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.{{ servicename }}-{{ domain }}.rule=Host(`autodiscover.{{ mail_domains[domain].maildomain }}`) || Host(`autoconfig.{{ mail_domains[domain].maildomain }}`)
-      - traefik.http.routers.{{ servicename }}-{{ domain }}.entrypoints=websecure
-      - traefik.http.services.{{ servicename }}-{{ domain }}.loadbalancer.server.port=8000
-    networks:
-      - default 
-      - web
-
-{% endfor %}
-
-networks:
-  web:
-    external: true
-

webserver/docker_coturn/templates/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
 
   coturn:
-    image: coturn/coturn:4.5.2
+    image: coturn/coturn:4.6.1
     restart: always
     command:
       - turnserver

webserver/docker_dokuwiki/tasks/main.yml

@@ -9,23 +9,19 @@
     path: "{{item}}"
     state: "directory"
   with_items:
-    - /srv/dokuwiki/
-    - /srv/dokuwiki/data
-    - /srv/dokuwiki/pdftemplate
+    - "{{ basedir }}"
+    - "{{ basedir }}/data"
+    - "{{ basedir }}/pdftemplate"
 
 - name: Docker Compose Konfig-Datei erstellen
   template:
     src: "{{item}}"
-    dest: "/srv/dokuwiki/{{item}}"
+    dest: "{{ basedir }}/{{item}}"
   with_items:
     - docker-compose.yml
     - Dockerfile
     - sendmail_plenum.py
-
-- name: start dokuwiki docker
-  docker_compose:
-    project_src: /srv/dokuwiki/
-    state: present
+  register: config
 
 - name: Cronjob für Mailversand Plenumsmail
   cron: 
@@ -33,5 +29,16 @@
     weekday: "0" 
     hour: "20" 
     minute: "0" 
-    job: "/usr/bin/python3 /srv/dokuwiki/sendmail_plenum.py"
+    job: "/usr/bin/python3 {{ basedir }}/sendmail_plenum.py"
     disabled: false
+
+- name: "stop {{ servicename}} docker"
+  docker_compose:
+    project_src: "{{ basedir }}"
+    state: absent
+  when: config.changed
+
+- name: "start {{ servicename}} docker"
+  docker_compose:
+    project_src: "{{ basedir }}"
+    state: present

webserver/docker_dokuwiki/templates/docker-compose.yml

@@ -3,6 +3,7 @@ version: "3"
 services:
 
   app:
+    # values set in configuration: noreply_email_user - noreply_email_pass - smtp_host - smtp_port 
     build: .
     image: "dokuwiki--{{ ansible_date_time.date }}--{{ ansible_date_time.hour }}-{{ ansible_date_time.minute }}-{{ ansible_date_time.second }}"
     restart: always
@@ -16,11 +17,8 @@ services:
       - traefik.http.services.{{ servicename }}.loadbalancer.server.port=80      
     networks:
       - default      
-      - mail
       - web  
-
+    
 networks:
-  mail:
-    external: true    
   web:
     external: true    

webserver/docker_dokuwiki/templates/sendmail_plenum.py

@@ -2,73 +2,76 @@ import smtplib
 import datetime
 from email.message import EmailMessage
 from email.utils import formatdate
-
-with open("/srv/dokuwiki/data/data/pages/intern/diskussionsthemen.txt") as fp:
-    raw = fp.read().split('\n')
-
-    # Extract Themen 
-    firstline = 0
-    lastline = 0
-    for index, line in enumerate(raw):
-        # Start marker
-        if "====== 1." in line:
-            firstline = index + 1
-            continue
+import requests
+
+def do_work():
+    with open("/srv/dokuwiki/data/data/pages/intern/diskussionsthemen.txt") as fp:
+        raw = fp.read().split('\n')
+
+        # Extract Themen 
+        firstline = 0
+        lastline = 0
+        for index, line in enumerate(raw):
+            # Start marker
+            if "====== 1." in line:
+                firstline = index + 1
+                continue
+            
+            # End marker
+            if "====== 2." in line:
+                lastline = index
+                break
         
-        # End marker
-        if "====== 2." in line:
-            lastline = index
-            break
-    
-    # Remove empty lines from topics
-    topics = []
-    for extracted in raw[firstline:lastline-1]:
-        if extracted != '':
-            topics.append(extracted)
-
-    # There are no topics - just exit
-    if (len(topics) == 0):
-        exit()
-
-    # calculate date of next tuesday
-    d = datetime.date.today()
-    while d.strftime('%a') != 'Tue':
-        d += datetime.timedelta(1)
-
-    # mail template 
-    mail = f"""
-Liebe Zonies,
-    
-es gibt wieder Themen die im Plenum besprochen werden sollen. Der nächste
-Reguläre Termin ist am nächsten Dienstag ({str(d)}) um 20:00.
-Im Wiki (https://wiki.warpzone.ms/intern:diskussionsthemen#diskussionsthemen_naechstes_plenum_automatische_einladung)
-stehen folgende Themen:
-
-{chr(10).join(topics)}
-
-Die Teilnahme ist natürlich auch remote möglich unter
-https://jitsi.dorf-post.de/warpzone-plenum möglich.
-
-Viele Grüße und bis Dienstag,
-
-sendmail_plenum.py
-"""
-
-    msg = EmailMessage()
-    msg['Subject'] = f'Aktuelle Plenumsthemen für Dienstag ({str(d)} 20:00)'
-    msg['From'] = '{{noreply_email_user}}'
-    msg['To'] = 'intern@warpzone.ms'
-    msg['Date'] = formatdate(localtime=True)
-    msg.set_content(mail)
-    
-    server = smtplib.SMTP('{{smtp_host}}', {{smtp_port}})
-    server.starttls()
-    server.login("{{noreply_email_user}}", "{{noreply_email_pass}}")
-    server.send_message(msg)
-    server.quit()
-
+        # Remove empty lines from topics
+        topics = []
+        for extracted in raw[firstline:lastline-1]:
+            if extracted != '':
+                topics.append(extracted)
+
+        # There are no topics - just exit
+        if (len(topics) == 0):
+            return True
+
+        # calculate date of next tuesday
+        d = datetime.date.today()
+        while d.strftime('%a') != 'Tue':
+            d += datetime.timedelta(1)
+
+        # mail template 
+        mail = f"""
+    Liebe Zonies,
+        
+    es gibt wieder Themen die im Plenum besprochen werden sollen. Der nächste
+    Reguläre Termin ist am nächsten Dienstag ({str(d)}) um 20:00.
+    Im Wiki (https://wiki.warpzone.ms/intern:diskussionsthemen#diskussionsthemen_naechstes_plenum_automatische_einladung)
+    stehen folgende Themen:
 
+    {chr(10).join(topics)}
 
+    Die Teilnahme ist natürlich auch remote möglich unter
+    https://jitsi.dorf-post.de/warpzone-plenum möglich.
 
+    Viele Grüße und bis Dienstag,
 
+    sendmail_plenum.py
+    """
 
+        msg = EmailMessage()
+        msg['Subject'] = f'Aktuelle Plenumsthemen für Dienstag ({str(d)} 20:00)'
+        msg['From'] = '{{noreply_email_user}}'
+        msg['To'] = 'intern@warpzone.ms'
+        msg['Date'] = formatdate(localtime=True)
+        msg.set_content(mail)
+        
+        server = smtplib.SMTP('{{smtp_host}}', {{smtp_port}})
+        server.starttls()
+        server.login("{{noreply_email_user}}", "{{noreply_email_pass}}")
+        server.send_message(msg)
+        server.quit()
+    return True
+
+success = False
+try:
+    success = do_work()
+finally:
+    requests.get("{{ healthchecks_url }}" if success else "{{ healthchecks_url }}" + "/fail")

webserver/docker_gitlab/templates/conf/gitlab.rb

@@ -116,8 +116,8 @@ gitlab_rails['gitlab_email_enabled'] = true
 # gitlab_rails['gitlab_email_smime_key_file'] = '/etc/gitlab/ssl/gitlab_smime.key'
 # gitlab_rails['gitlab_email_smime_cert_file'] = '/etc/gitlab/ssl/gitlab_smime.crt'
 # gitlab_rails['gitlab_email_smime_ca_certs_file'] = '/etc/gitlab/ssl/gitlab_smime_cas.crt'
-gitlab_rails['gitlab_email_from'] = '{{ noreply_email_user }}'
-gitlab_rails['gitlab_email_display_name'] = 'Gitlab Warpzone'
+gitlab_rails['gitlab_email_from'] = 'gitlab@{{ smtp_domain }}'
+gitlab_rails['gitlab_email_display_name'] = 'Warpzone Gitlab'
 gitlab_rails['gitlab_email_reply_to'] = '{{ noreply_email_user }}'
 
 ### GitLab user privileges

webserver/docker_gitlab/templates/docker-compose.yml

@@ -5,7 +5,7 @@ services:
 
   app:
 
-    image: gitlab/gitlab-ce:15.9.3-ce.0
+    image: gitlab/gitlab-ce:15.11.5-ce.0
     restart: always
     ports:
       - "444:22"

webserver/docker_icinga/tasks/main.yml

@@ -8,6 +8,7 @@
     - { path: "{{ basedir }}/icinga_api_pass",  length: 8 }
     - { path: "{{ basedir }}/mysql_admin_pass",  length: 12 }
     - { path: "{{ basedir }}/mysql_user_pass",  length: 12 }
+    - { path: "{{ basedir }}/matrix_notification_access_token",  length: -1 }
 
 
 - name: pakete installieren

webserver/docker_icinga/templates/Dockerfile

@@ -13,9 +13,10 @@ RUN apt-get update \
     libnet-dns-perl \
     libnet-ip-perl \
     perl \
-    python3-requests \
     python3 \
-    python3-paho-mqtt \
+    python3-pip \
+    python3-requests \
+    virtualenv \
  && apt-get autoremove -y \
  && apt-get clean \
  && rm -rf /tmp/* /var/lib/apt/lists/* /var/cache/debconf/*-old
@@ -48,3 +49,17 @@ RUN cd /opt/ \
  && git clone https://github.com/elberfeld/check_metric_value.git \
  && cd /opt/check_metric_value/ \
  && git checkout b94d3c3e78497a05e3b4520d33421f37e4d77985
+
+# icinga2-matrix-bot - commit from 10.06.2018
+# create a symlink to emulate virtualenv 
+# patch matrix-service-notification.sh
+RUN cd /opt/ \
+ && git clone https://github.com/symptog/icinga2-matrix-bot.git \
+ && cd /opt/icinga2-matrix-bot/ \
+ && git checkout 86d03ed8884950eb2b883a9a94ecf93460b8e0bb \
+ && pip install -r requirements.txt \
+ && mkdir /opt/icinga2-matrix-bot/.venv \
+ && mkdir /opt/icinga2-matrix-bot/.venv/bin \
+ && ln -s /usr/bin/python3 /opt/icinga2-matrix-bot/.venv/bin/python \
+ && sed -i 's/matrix-host-state/matrix-service-state/' icinga2/matrix-service-notification.sh
+ 
\ No newline at end of file

webserver/docker_icinga/templates/etc/icinga/conf.d/commands2.conf

 
+/**
+ * Check MQTT values
+ */
+
 object CheckCommand "check_mqtt" {
   import "plugin-check-command"
 
@@ -33,6 +37,10 @@ object CheckCommand "check_mqtt" {
   }
 }
 
+/**
+ * Check for Mail Blacklisting
+ */
+
 object CheckCommand "check_mail_blacklist" {
   import "plugin-check-command"
 
@@ -45,6 +53,9 @@ object CheckCommand "check_mail_blacklist" {
   }
 }
 
+/**
+ * Check for Prometheus values 
+ */
 
 object CheckCommand "check_metric_value" {
   import "plugin-check-command"
@@ -62,4 +73,56 @@ object CheckCommand "check_metric_value" {
     "-w" = "$metric_warn$"
     "-c" = "$metric_crit$"
   }
-}
\ No newline at end of file
+}
+
+/**
+ * Matrix Notification 
+ */
+
+object NotificationCommand "matrix-host-notification" {
+  import "plugin-notification-command"
+
+  command = [ "/opt/icinga2-matrix-bot/icinga2/matrix-host-notification.sh" ]
+
+  env = {
+    "NOTIFICATIONTYPE" = "$notification.type$"
+    "HOSTALIAS" = "$host.display_name$",
+    "HOSTADDRESS" = "$address$",
+    "HOSTNAME" = "$host.name$",
+    "HOSTSTATE" = "$host.state$",
+    "LONGDATETIME" = "$icinga.long_date_time$",
+    "HOSTOUTPUT" = "$host.output$",
+    "NOTIFICATIONAUTHORNAME" = "$notification.author$",
+    "NOTIFICATIONCOMMENT" = "$notification.comment$",
+    "HOSTDISPLAYNAME" = "$host.display_name$",
+    "ICINGA_WEBURL" = "$notification_icingaweb2url$",
+    "MATRIX_SERVER" = "$user.vars.matrix.server$",
+    "MATRIX_TOKEN" = "$user.vars.matrix.token$",
+    "MATRIX_CHANNEL" = "$user.vars.matrix.channel$",
+  }
+}
+
+object NotificationCommand "matrix-service-notification" {
+  import "plugin-notification-command"
+
+  command = [ "/opt/icinga2-matrix-bot/icinga2/matrix-service-notification.sh" ]
+
+  env = {
+    "NOTIFICATIONTYPE" = "$notification.type$"
+    "SERVICEDESC" = "$service.name$"
+    "HOSTALIAS" = "$host.display_name$",
+    "HOSTNAME" = "$host.name$",
+    "HOSTADDRESS" = "$address$",
+    "SERVICESTATE" = "$service.state$",
+    "LONGDATETIME" = "$icinga.long_date_time$",
+    "SERVICEOUTPUT" = "$service.output$",
+    "NOTIFICATIONAUTHORNAME" = "$notification.author$",
+    "NOTIFICATIONCOMMENT" = "$notification.comment$",
+    "HOSTDISPLAYNAME" = "$host.display_name$",
+    "SERVICEDISPLAYNAME" = "$service.display_name$",
+    "ICINGA_WEBURL" = "$notification_icingaweb2url$",
+    "MATRIX_SERVER" = "$user.vars.matrix.server$",
+    "MATRIX_TOKEN" = "$user.vars.matrix.token$",
+    "MATRIX_CHANNEL" = "$user.vars.matrix.channel$",
+  }
+}

webserver/docker_icinga/templates/etc/icinga/conf.d/notifications.conf

+
+apply Notification "matrix" to Host {
+  import "matrix-host-notification"
+
+  users = [ "matrix" ]
+
+  interval = 4h
+
+  assign where host.address 
+}
+
+
+apply Notification "matrix" to Service {
+  import "matrix-service-notification"
+
+  users = [ "matrix" ]
+
+  interval = 4h
+
+  assign where service.name
+}
+

webserver/docker_icinga/templates/etc/icinga/conf.d/templates.conf

@@ -81,3 +81,30 @@ template Notification "mail-service-notification" {
 
   period = "24x7"
 }
+
+/**
+ * Provides default settings for Matrix.org service notifications.
+ */
+
+template Notification "matrix-host-notification" {
+    command = "matrix-host-notification"
+
+    states = [ Up, Down ]
+    types = [ Problem, Acknowledgement, Custom, FlappingStart, FlappingEnd ]
+    period = "24x7"
+    vars += {
+        notification_icingaweb2url = "https://{{ domain }}/icingaweb2"
+    }
+}
+
+template Notification "matrix-service-notification" {
+    command = "matrix-service-notification"
+
+    states = [ OK, Critical, Unknown ]
+    types = [ Problem, Acknowledgement, Custom, FlappingStart, FlappingEnd ]
+    period = "24x7"
+    vars += {
+        notification_icingaweb2url = "https://{{ domain }}/icingaweb2"
+    }
+}
+

webserver/docker_icinga/templates/etc/icinga/conf.d/users_groups.conf

@@ -3,3 +3,18 @@ object UserGroup "icingaadmins" {
   display_name = "Icinga 2 Admin Group"
 }
 
+object User "matrix" {
+  import "generic-user"
+
+  display_name = "Matrix User"
+  vars.matrix = {
+    token = "{{ matrix_notification_access_token }}"
+    channel = "!iYefxbySFEfFQfUGEK:matrix.warpzone.ms"
+    server = "https://matrix.warpzone.ms"
+  }
+}
+
+object UserGroup "matrix" {
+  display_name = "Matrix Group"
+  assign where user.vars.matrix
+}

webserver/docker_keycloak/tasks/main.yml

@@ -2,6 +2,7 @@
 
 - include_tasks: ../functions/get_secret.yml
   with_items:
+   - { path: /srv/shared/noreply_email_pass, length: -1 } 
    - { path: /srv/keycloak/keycloak_admin_pass,  length: 32 }
    - { path: /srv/keycloak/postgres_user_pass,  length: 24 }
 

webserver/docker_keycloak/templates/docker-compose.yml

@@ -6,7 +6,7 @@ services:
 
 
   app:
-
+    # values set in configuration: noreply_email_user - noreply_email_pass - smtp_host - smtp_port 
     image: jboss/keycloak:16.1.1
     restart: always
     depends_on:
@@ -31,7 +31,6 @@ services:
       - traefik.http.services.{{ servicename }}.loadbalancer.server.port=8080
     networks:
       - default
-      - mail
       - web
 
 
@@ -64,7 +63,5 @@ services:
 
 
 networks:
-  mail:
-    external: true
   web:
     external: true

webserver/docker_mail/defaults/main.yaml

----
-servicename: mail
-basedir: /srv/mail

webserver/docker_mail/tasks/main.yaml

@@ -2,21 +2,23 @@
 
 - include_tasks: ../functions/get_secret.yml
   with_items:
-   - { path: "{{ basedir }}/secrets/mailcow_admin_pass",  length: 28 }
-   - { path: "{{ basedir }}/secrets/mysql_mailcow_pass",  length: 28 }
-   - { path: "{{ basedir }}/secrets/mysql_root_pass",     length: 28 }
-   # mailman
+   - { path: "{{ basedir }}/secrets/mailu_secret_key",  length: 32 }
+   - { path: "{{ basedir }}/secrets/mailu_admin_pass",  length: 32 }
+   - { path: "{{ basedir }}/secrets/mailu_api_token",  length: 32 }
+   - { path: "{{ basedir }}/secrets/mailu_db_pass",  length: 28 }
+   - { path: "{{ basedir }}/secrets/roundcube_db_pass",  length: 28 }
    - { path: "{{ basedir }}/secrets/hyperkitty_api_key",  length: 28 }
-   - { path: "{{ basedir }}/secrets/postgres_mailman_pass",  length: 28 }
+   - { path: "{{ basedir }}/secrets/mailman_db_pass",  length: 28 }
    - { path: "{{ basedir }}/secrets/mailman_secret_key",  length: 28 }
    - { path: "{{ basedir }}/secrets/mailman_restapi_pass",  length: 28 }
+   - { path: "{{ basedir }}/secrets/mysql_root_pass",  length: 28 }
 
 
-- name: pakete installieren
-  apt:
-    pkg: ['git', 'logrotate', 'openssl']
-    update_cache: no
-    state: present
+# - name: pakete installieren
+#   apt:
+#     pkg: ['logrotate']
+#     update_cache: no
+#     state: present
 
 
 - name: "create folder struct for {{ servicename }}"
@@ -26,139 +28,85 @@
   with_items:
     - "{{ basedir }}"
     - "{{ basedir }}/secrets"
-    # mailcow
-    - "{{ basedir }}/data/mysql"
-    - "{{ basedir }}/data/mysql-socket"
-    - "{{ basedir }}/data/redis"
-    - "{{ basedir }}/data/rspamd"
-    - "{{ basedir }}/data/solr"
-    - "{{ basedir }}/data/postfix"
-    - "{{ basedir }}/data/sogo-web"
-    - "{{ basedir }}/data/sogo-userdata-backup"
-    - "{{ basedir }}/data/xmpp-vol-1"
-    - "{{ basedir }}/data/xmpp-upload-vol-1"
-    # mailmann
-    - "{{ basedir }}/data/mailman-core"
-    - "{{ basedir }}/data/mailman-core/var"
-    - "{{ basedir }}/data/mailman-core/var/data"
-    - "{{ basedir }}/data/mailman-web"
-    - "{{ basedir }}/data/mailman-postgres"
-
-
-- name: "create folder struct for {{ servicename }} with rights"
-  file:
-    path: "{{ item }}"
-    state: "directory"
-    owner: "5000"
-    group: "5000"
-    mode: "ugo+rwx"
-  with_items:
-  - "{{ basedir }}/data/crypt"
-  - "{{ basedir }}/data/vmail"
-  - "{{ basedir }}/data/vmail-index"
-
-
-- name: check if git dir exists
-  stat:
-    path: "{{ basedir }}/mailcow-dockerized/.git"
-  register: mailcow_dotgit
-
-- name: revert main.cf to avoid local changes
-  command: "git checkout data/conf/postfix/main.cf"
-  args:
-    chdir: "{{ basedir }}/mailcow-dockerized"
-  when: mailcow_dotgit.stat.exists == True
-
-
-- name: Git checkout mailcow
-  git:
-    repo: 'https://github.com/mailcow/mailcow-dockerized.git'
-    dest: "{{ basedir }}/mailcow-dockerized"
-    version: d6a3094bcc8b3d748994978ca7e274301b39e583
-    # current version 2021-05-18
-
-
-- name: Git checkout mailman-dockerized
-  git:
-    repo: 'https://github.com/maxking/docker-mailman.git'
-    dest: "{{ basedir }}/docker-mailman"
-    version: v0.4.4
-    # current version 2020-03-15
-
-
-- name: "create folder struct for {{ servicename }} 3"
-  file:
-    path: "{{ item }}"
-    state: "directory"
-  with_items:
-    - "{{ basedir }}/mailcow-dockerized/data/assets/ssl/"
-
-
-- name: check if DH Params exists
-  stat:
-    path: "{{ basedir }}/mailcow-dockerized/data/assets/ssl/dhparams.pem"
-  register: dhparams
-
-- name: generate new DH Params
-  command: "openssl dhparam -out {{ basedir }}/mailcow-dockerized/data/assets/ssl/dhparams.pem 2048"
-  when: dhparams.stat.exists == False
-
-
-- name: deploy mailcow config files
-  template:
-    dest:  "{{ basedir }}/{{ item }}"
-    src: "{{ item }}"
-    mode: 0644
-  with_items:
-    - mailcow-dockerized/mailcow.conf
-    - mailcow-dockerized/docker-compose.override.yml
-    - mailcow-dockerized/data/conf/postfix/extra.cf
-  register: config_mailcow
-
-
-- name: deploy mailman config files
+    - "{{ basedir }}/db"
+    - "{{ basedir }}/db-init"
+    - "{{ basedir }}/mailu"
+    - "{{ basedir }}/mailu/overrides"
+    - "{{ basedir }}/mailu/overrides/postfix"
+    - "{{ basedir }}/mailman-core"
+    - "{{ basedir }}/mailman-core/var"
+    - "{{ basedir }}/mailman-core/var/data"
+    - "{{ basedir }}/mailman-web"
+#    - "{{ basedir }}/mailman-db"
+
+
+# - name: "create folder struct for {{ servicename }} with rights"
+#   file:
+#     path: "{{ item }}"
+#     state: "directory"
+#     owner: "5000"
+#     group: "5000"
+#     mode: "ugo+rwx"
+#   with_items:
+#   - "{{ basedir }}/data/crypt"
+#   - "{{ basedir }}/data/vmail"
+#   - "{{ basedir }}/data/vmail-index"
+
+
+
+- name: "deploy {{ servicename }} config files"
   template:
     dest:  "{{ basedir }}/{{ item }}"
     src: "{{ item }}"
     mode: 0644
   with_items:
-    - docker-mailman/docker-compose.override.yml
-    - docker-mailman/nginx.conf
-    - data/mailman-core/mailman-extra.cfg
-    - data/mailman-web/settings_local.py
-  register: config_mailman
-
-
-- name: deploy LogRotate configs
-  template:
-    src: "logrotate/{{item}}"
-    dest: "/etc/logrotate.d/{{item}}"
-  with_items:
-    - mailman-core
-    - mailman-web
-
-
-# Start mailcow containers
-- name: "stop {{ servicename }} (mailcow) docker"
+    - docker-compose.yml
+    - mailu.env
+    - mailman.env
+    - mailman-nginx.conf
+    - db-init/mailman.sql
+    - db-init/roundcube.sql
+    - mailu/overrides/postfix/postfix.cf
+  register: config
+
+- name: "set local dns record"
+  become: true
+  blockinfile:
+    path: /etc/hosts
+    create: yes
+    block: |
+      {{ ext_ip4 }} mailserver.warpzone.ms
+
+# - name: deploy LogRotate configs
+#   template:
+#     src: "logrotate/{{item}}"
+#     dest: "/etc/logrotate.d/{{item}}"
+#   with_items:
+#     - mailman-core
+#     - mailman-web
+
+
+# Start containers
+- name: "stop {{ servicename }} docker"
   docker_compose:
-    project_src: "{{ basedir }}/mailcow-dockerized"
+    project_src: "{{ basedir }}"
     state: absent
-  when: config_mailcow.changed
+  when: config.changed
 
-- name: "start {{ servicename }} (mailcow) docker"
+- name: "start {{ servicename }} docker"
   docker_compose:
-    project_src: "{{ basedir }}/mailcow-dockerized"
+    project_src: "{{ basedir }}"
     state: present
 
 
 # Start mailman containers
-- name: "stop {{ servicename }} (mailman) docker"
-  docker_compose:
-    project_src: "{{ basedir }}/docker-mailman"
-    state: absent
-  when: config_mailcow.changed
-
-- name: "start {{ servicename }} (mailman) docker"
-  docker_compose:
-    project_src: "{{ basedir }}/docker-mailman"
-    state: present
+# - name: "stop {{ servicename }} (mailman) docker"
+#   docker_compose:
+#     project_src: "{{ basedir }}/docker-mailman"
+#     state: absent
+#   when: config_mailcow.changed
+
+# - name: "start {{ servicename }} (mailman) docker"
+#   docker_compose:
+#     project_src: "{{ basedir }}/docker-mailman"
+#     state: present

webserver/docker_mail/templates/data/mailman-core/mailman-extra.cfg

-[mailman]
-site_owner: listmaster@warpzone.ms
-
-[mta]
-remove_dkim_headers: yes

webserver/docker_mail/templates/data/mailman-web/settings_local.py

-
-from settings import *
-import socket
-
-# Archivierung für Mailman-Core Container erlauben
-MAILMAN_ARCHIVER_FROM = (socket.gethostbyname('mailman-core'),)
-
-# disable social logins (google, facebook, etc. )
-INSTALLED_APPS = [a for a in INSTALLED_APPS if not 
-a.startswith('allauth.socialaccount.providers') and not
-a.startswith('django_mailman3.lib.auth.fedora')]
-
-# Mail backend settings
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = 'postfix'
-EMAIL_PORT = 25
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-DEFAULT_FROM_EMAIL = 'listmaster@warpzone.ms'
-SERVER_EMAIL = 'listmaster@warpzone.ms'

webserver/docker_mail/templates/db-init/mailman.sql

+CREATE DATABASE IF NOT EXISTS mailman;
+CREATE USER IF NOT EXISTS mailman@'%' IDENTIFIED BY '{{ mailman_db_pass }}';
+GRANT ALL ON mailman.* TO mailman@'%';
+FLUSH PRIVILEGES;