From 42c2b08b3e52b06f7644ca22ff7116ed5be9834b Mon Sep 17 00:00:00 2001
From: Aeris <a3x@eris.cc>
Date: Sun, 6 Jan 2019 19:32:21 +0100
Subject: [PATCH] redeployed from docker to mailserver/docker automation still
 wonky

---
 deploy/playbook.retry                              |  1 +
 deploy/roles/mailserver/tasks/main.yml             | 14 +++++++-------
 .../mailserver/templates/docker-compose.yml.j2     | 11 ++++-------
 deploy/roles/mailserver/vars/main.yml              |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 deploy/playbook.retry

diff --git a/deploy/playbook.retry b/deploy/playbook.retry
new file mode 100644
index 0000000..5bbfccc
--- /dev/null
+++ b/deploy/playbook.retry
@@ -0,0 +1 @@
+club_mail
diff --git a/deploy/roles/mailserver/tasks/main.yml b/deploy/roles/mailserver/tasks/main.yml
index a160924..b3bff38 100644
--- a/deploy/roles/mailserver/tasks/main.yml
+++ b/deploy/roles/mailserver/tasks/main.yml
@@ -47,10 +47,15 @@
     src: config.inc.php.j2
     dest: "{{ docker_project_folder }}/mailserver/webmail/config.inc.php"
 
+- name: Create mailman config folder
+  file:
+    name: "{{ docker_data_folder }}/mailserver/mailman/core"
+    state: directory
+
 - name: Create mailman config
   copy:
-    dest: "{{ docker_project_folder }}/mailserver/mailman"
-    src: mailman
+    dest: "{{ docker_data_folder }}/mailserver/mailman/core"
+    src: mailman/mailman-extra.cfg
 
 - name: Copy Mailman Settings
   template:
@@ -95,11 +100,6 @@
     src: traefik
     dest: "{{ docker_project_folder }}/mailserver" 
 
-- name: Copy mailman-conf
-  copy:
-    src: mailman/mailman-extra.cfg
-    dest: "{{ docker_project_folder }}/mailserver/mailman-extra.cfg"
-
 - name: New Mysql EntryPoint
   copy:
     src: db/docker-entrypoint.sh
diff --git a/deploy/roles/mailserver/templates/docker-compose.yml.j2 b/deploy/roles/mailserver/templates/docker-compose.yml.j2
index 925a924..e0b6fd7 100644
--- a/deploy/roles/mailserver/templates/docker-compose.yml.j2
+++ b/deploy/roles/mailserver/templates/docker-compose.yml.j2
@@ -17,7 +17,7 @@ services:
       - mailman-core:mailman-core
     volumes:
       - {{ docker_data_folder }}/mailserver/mailman/core:/mailman
-      - mails:/home/vmail
+      - {{ docker_data_folder }}/mailserver/mails:/home/vmail
       - /dev/log:/dev/log
       - certs:/certs
     environment:
@@ -51,7 +51,7 @@ services:
       - db
       - spam
     volumes:
-      - mails:/home/vmail
+      - {{ docker_data_folder }}/mailserver/mails:/home/vmail
       - certs:/certs
     environment:
       - "DATABASE_USER=mail"
@@ -151,7 +151,7 @@ services:
     hostname: mailman-core
     volumes:
       - {{ docker_data_folder }}/mailserver/mailman/core:/opt/mailman/
-      - ./mailman/mailman-extra.cfg:/opt/mailman/core/mailman-extra.cfg
+      #- ./mailman/mailman-extra.cfg:/opt/mailman/core/mailman-extra.cfg
     expose:
       - 8024
       - 8001
@@ -201,8 +201,6 @@ services:
       - SMTP_HOST=smtp
       - UWSGI_STATIC_MAP=/static=/opt/mailman-web-data/static
     labels:
-      #- "traefik.frontend.rule=Host:mailman.{{ DOMAIN }}"
-      #- "traefik.port=8000"
       - "traefik.enable=false"
   
     
@@ -241,7 +239,7 @@ services:
     container_name: extractor
     image: danielhuisman/traefik-certificate-extractor
     volumes: 
-      - {{ docker_project_folder }}/mailserver/traefik:/app/data
+      - {{ docker_data_folder }}/mailserver/traefik:/app/data
       - certs:/app/certs_flat
     labels:
       - "traefik.enable=false"
@@ -250,6 +248,5 @@ networks:
   default:
 
 volumes:
-  mails:
   certs:
   spam:
diff --git a/deploy/roles/mailserver/vars/main.yml b/deploy/roles/mailserver/vars/main.yml
index a06479b..75d9ec3 100644
--- a/deploy/roles/mailserver/vars/main.yml
+++ b/deploy/roles/mailserver/vars/main.yml
@@ -1,7 +1,7 @@
 ---
 become_method: sudo
 ansible_ask_become_pass: yes
-docker_data_folder: /data_test
+docker_data_folder: /data
 docker_project_folder: /var/docker
 DOMAIN: creditcards.bayern
 mailman_sender_address: "lists@{{ DOMAIN }}"