diff --git a/host_vars/redisdead.adm.crans.org.yml b/host_vars/redisdead.adm.crans.org.yml new file mode 100644 index 00000000..5d7def8e --- /dev/null +++ b/host_vars/redisdead.adm.crans.org.yml @@ -0,0 +1,7 @@ +postfix: + primary: true + secondary: false + public: true + dkim: true + mailman: true + titanic: false diff --git a/postfix.yml b/postfix.yml index 5ce4233b..3eab868d 100755 --- a/postfix.yml +++ b/postfix.yml @@ -1,6 +1,6 @@ #!/usr/bin/env ansible-playbook # Postfix playbook --- -- hosts: sputnik.adm.crans.org, boeing.adm.crans.org +- hosts: sputnik.adm.crans.org, boeing.adm.crans.org, redisdead.adm.crans.org roles: - postfix diff --git a/roles/postfix/templates/postfix/main.cf.j2 b/roles/postfix/templates/postfix/main.cf.j2 index a390474d..98dede97 100644 --- a/roles/postfix/templates/postfix/main.cf.j2 +++ b/roles/postfix/templates/postfix/main.cf.j2 @@ -24,15 +24,12 @@ mydestination = {{ ansible_hostname }}, $myhostname, localhost, localhost.$mydom {% endif %} # Domaine relaye par ce MX relay_domains = $mydestination -{% if postfix.mailman %} +{% if postfix.mailman or postfix.public %} lists.$mydomain {% endif %} {% if postfix.secondary %} $mydomain, crans.ens-cachan.fr, clubs.ens-cachan.fr, install-party.ens-cachan.fr, crans.fr, crans.eu {% endif %} -{% if postfix.public %} - lists.$mydomain -{% endif %} {% if postfix.mailman %} relay_recipient_maps = hash:/var/local/re2o-services/mail-server/generated/virtual