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

webserver/docker_mail/tasks/main.yaml

@@ -39,6 +39,8 @@
     - "{{ 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"
@@ -65,7 +67,7 @@
     path: "{{ basedir }}/mailcow-dockerized/.git"
   register: mailcow_dotgit
 
-- name: revert main.cf to avoid local changes 
+- name: revert main.cf to avoid local changes
   command: "git checkout data/conf/postfix/main.cf"
   args:
     chdir: "{{ basedir }}/mailcow-dockerized"
@@ -76,10 +78,10 @@
   git:
     repo: 'https://github.com/mailcow/mailcow-dockerized.git'
     dest: "{{ basedir }}/mailcow-dockerized"
-    version: 58cce74bc9b76c47bb62f845af830f52f0976a5a
-    # current version 2020-11-13
+    version: a5eec3569eac1ddb33375ffde5df8b868f38c908
+    # current version 2021-02-22
+
 
-  
 - name: Git checkout mailman-dockerized
   git:
     repo: 'https://github.com/maxking/docker-mailman.git'
@@ -131,9 +133,9 @@
   register: config_mailman
 
 
-- name: deploy LogRotate configs  
-  template: 
-    src: "logrotate/{{item}}" 
+- name: deploy LogRotate configs
+  template:
+    src: "logrotate/{{item}}"
     dest: "/etc/logrotate.d/{{item}}"
   with_items:
     - mailman-core

webserver/docker_mail/templates/mailcow-dockerized/docker-compose.override.yml

@@ -26,7 +26,7 @@ services:
     postfix-exporter:
         image: unikum/postfix_exporter:latest
         restart: always
-        depends_on: 
+        depends_on:
           - postfix-mailcow
         ports:
           - "{{ int_ip4 }}:9154:9154"
@@ -48,12 +48,13 @@ services:
           aliases:
             - nginx
             - sogo
+            - ejabberd
         web:
           aliases:
             - mailcow
 
 
-# Mailman konfiguration in Postfix-Container mounten 
+# Mailman konfiguration in Postfix-Container mounten
 # postfix ans mail netzwerk um mit mailman zu kommunizieren
 
     postfix-mailcow:
@@ -82,6 +83,10 @@ services:
       image: stakater/exit-container
       restart: 'no'
 
+    ejabberd-mailcow:
+      image: stakater/exit-container
+      restart: 'no'
+
 
 # Externes Netzwerk
 
@@ -163,3 +168,15 @@ volumes:
       o: bind
       type: none
       device: "{{ basedir }}/data/sogo-userdata-backup"
+  xmpp-vol-1:
+    driver: local
+    driver_opts:
+      o: bind
+      type: none
+      device: "{{ basedir }}/data/xmpp-vol-1"
+  xmpp-upload-vol-1:
+    driver: local
+    driver_opts:
+      o: bind
+      type: none
+      device: "{{ basedir }}/data/xmpp-upload-vol-1"

webserver/docker_mail/templates/mailcow-dockerized/mailcow.conf

@@ -54,6 +54,12 @@ SQL_PORT=127.0.0.1:23306
 SOLR_PORT=127.0.0.1:18983
 REDIS_PORT=127.0.0.1:7654
 
+# bind jabber to nonstandard port because we already have a jabber running
+# no (vig) risk as we use the exit container
+XMPP_C2S_PORT=127:0.0.1:15222
+XMPP_S2S_PORT=127:0.0.1:15269
+XMPP_HTTPS_PORT=127:0.0.1:15443
+
 # Your timezone
 
 TZ=Europe/Berlin