diff --git a/deploy.sh b/deploy.sh index 37b1b93..16e465a 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,6 +1,6 @@ #!/bin/sh -BASE_CMD="ansible-playbook playbook.yml -i datacoop_hosts --ask-vault-pass" +BASE_CMD="ansible-playbook playbook.yml -i datacoop_hosts --vault-password-file ~/.vault_password_file" if [ -z "$1" ]; then echo "Deploying all!" diff --git a/roles/docker/files/mailman/mailman-extra.cfg b/roles/docker/files/mailman/mailman-extra.cfg new file mode 100644 index 0000000..99f0a4e --- /dev/null +++ b/roles/docker/files/mailman/mailman-extra.cfg @@ -0,0 +1,10 @@ +[mta] +incoming: mailman.mta.postfix.LMTP +outgoing: mailman.mta.deliver.deliver +# mailman-core hostname or IP from the Postfix server +lmtp_host: localhost +lmtp_port: 8024 +# Postfix server's hostname or IP from mailman-core +smtp_host: smtp +smtp_port: 25 +configuration: /etc/postfix-mailman.cfg \ No newline at end of file diff --git a/roles/docker/files/mailman/postfix.cf b/roles/docker/files/mailman/postfix.cf index bc5d4a4..15f709b 100644 --- a/roles/docker/files/mailman/postfix.cf +++ b/roles/docker/files/mailman/postfix.cf @@ -6,5 +6,6 @@ owner_request_special = no virtual_mailbox_maps = regexp:/opt/mailman-core-data/postfix_lmtp \$virtual_alias_maps transport_maps = regexp:/opt/mailman-core-data/postfix_lmtp local_recipient_maps = regexp:/opt/mailman-core-data/postfix_lmtp +relay_domains = regexp:/opt/mailman-core-data/postfix_domains always_add_missing_headers = yes local_header_rewrite_clients = permit_sasl_authenticated \ No newline at end of file diff --git a/roles/docker/tasks/services/mailu.yml b/roles/docker/tasks/services/mailu.yml index 0fd39d4..8375a3e 100644 --- a/roles/docker/tasks/services/mailu.yml +++ b/roles/docker/tasks/services/mailu.yml @@ -49,6 +49,12 @@ dest: "{{ mailu.volume_folder }}/overrides/postfix.cf" mode: "0644" +- name: "[Mailman] copy mailman config" + copy: + src: mailman/mailman-extra.cfg + dest: "{{ mailman.volume_folder }}/core/mailman-extra.cfg" + mode: "0644" + - name: Start containers docker_compose: project_name: mail_server