redeployed from docker to mailserver/docker automation still wonky

This commit is contained in:
Aeris 2019-01-06 19:32:21 +01:00
parent 3bfceed585
commit 42c2b08b3e
4 changed files with 13 additions and 15 deletions

1
deploy/playbook.retry Normal file
View file

@ -0,0 +1 @@
club_mail

View file

@ -47,10 +47,15 @@
src: config.inc.php.j2 src: config.inc.php.j2
dest: "{{ docker_project_folder }}/mailserver/webmail/config.inc.php" 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 - name: Create mailman config
copy: copy:
dest: "{{ docker_project_folder }}/mailserver/mailman" dest: "{{ docker_data_folder }}/mailserver/mailman/core"
src: mailman src: mailman/mailman-extra.cfg
- name: Copy Mailman Settings - name: Copy Mailman Settings
template: template:
@ -95,11 +100,6 @@
src: traefik src: traefik
dest: "{{ docker_project_folder }}/mailserver" 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 - name: New Mysql EntryPoint
copy: copy:
src: db/docker-entrypoint.sh src: db/docker-entrypoint.sh

View file

@ -17,7 +17,7 @@ services:
- mailman-core:mailman-core - mailman-core:mailman-core
volumes: volumes:
- {{ docker_data_folder }}/mailserver/mailman/core:/mailman - {{ docker_data_folder }}/mailserver/mailman/core:/mailman
- mails:/home/vmail - {{ docker_data_folder }}/mailserver/mails:/home/vmail
- /dev/log:/dev/log - /dev/log:/dev/log
- certs:/certs - certs:/certs
environment: environment:
@ -51,7 +51,7 @@ services:
- db - db
- spam - spam
volumes: volumes:
- mails:/home/vmail - {{ docker_data_folder }}/mailserver/mails:/home/vmail
- certs:/certs - certs:/certs
environment: environment:
- "DATABASE_USER=mail" - "DATABASE_USER=mail"
@ -151,7 +151,7 @@ services:
hostname: mailman-core hostname: mailman-core
volumes: volumes:
- {{ docker_data_folder }}/mailserver/mailman/core:/opt/mailman/ - {{ 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: expose:
- 8024 - 8024
- 8001 - 8001
@ -201,8 +201,6 @@ services:
- SMTP_HOST=smtp - SMTP_HOST=smtp
- UWSGI_STATIC_MAP=/static=/opt/mailman-web-data/static - UWSGI_STATIC_MAP=/static=/opt/mailman-web-data/static
labels: labels:
#- "traefik.frontend.rule=Host:mailman.{{ DOMAIN }}"
#- "traefik.port=8000"
- "traefik.enable=false" - "traefik.enable=false"
@ -241,7 +239,7 @@ services:
container_name: extractor container_name: extractor
image: danielhuisman/traefik-certificate-extractor image: danielhuisman/traefik-certificate-extractor
volumes: volumes:
- {{ docker_project_folder }}/mailserver/traefik:/app/data - {{ docker_data_folder }}/mailserver/traefik:/app/data
- certs:/app/certs_flat - certs:/app/certs_flat
labels: labels:
- "traefik.enable=false" - "traefik.enable=false"
@ -250,6 +248,5 @@ networks:
default: default:
volumes: volumes:
mails:
certs: certs:
spam: spam:

View file

@ -1,7 +1,7 @@
--- ---
become_method: sudo become_method: sudo
ansible_ask_become_pass: yes ansible_ask_become_pass: yes
docker_data_folder: /data_test docker_data_folder: /data
docker_project_folder: /var/docker docker_project_folder: /var/docker
DOMAIN: creditcards.bayern DOMAIN: creditcards.bayern
mailman_sender_address: "lists@{{ DOMAIN }}" mailman_sender_address: "lists@{{ DOMAIN }}"