diff --git a/host_vars/boeing.adm.crans.org.yml b/host_vars/boeing.adm.crans.org.yml index fe9d1c69afc8d9e28107cc3fdf127b8f6071009d..882cb80deca805f98346ed49eb3f96592ccd35dd 100644 --- a/host_vars/boeing.adm.crans.org.yml +++ b/host_vars/boeing.adm.crans.org.yml @@ -7,5 +7,4 @@ postfix: secondary: true public: true dkim: true - mailman: false titanic: true diff --git a/host_vars/redisdead.adm.crans.org.yml b/host_vars/redisdead.adm.crans.org.yml index 8228a1d0f68dc4a674859cef562009440f788244..999c2eb4d7632226889c96cd6d20d9a7bf55aef0 100644 --- a/host_vars/redisdead.adm.crans.org.yml +++ b/host_vars/redisdead.adm.crans.org.yml @@ -8,7 +8,6 @@ postfix: secondary: false public: true dkim: true - mailman: true titanic: false to_backup: diff --git a/host_vars/sputnik.adm.crans.org.yml b/host_vars/sputnik.adm.crans.org.yml index 7e6ff41c5707a678975880815c188a73962074d5..0ad18335eb30ae0a5a56f2a413d50188b85c5386 100644 --- a/host_vars/sputnik.adm.crans.org.yml +++ b/host_vars/sputnik.adm.crans.org.yml @@ -4,7 +4,6 @@ postfix: secondary: true public: true dkim: true - mailman: false titanic: false to_backup: diff --git a/roles/postfix/templates/postfix/transport.j2 b/roles/postfix/templates/postfix/transport.j2 index 954c3b0133f7a8699bd436f6014ba173300b766c..87cd249d67aa2ffcad63db726cddd484b6016275 100644 --- a/roles/postfix/templates/postfix/transport.j2 +++ b/roles/postfix/templates/postfix/transport.j2 @@ -1,11 +1,9 @@ {{ ansible_header | comment }} # Transport des mails -{% if postfix.mailman %} +{% if postfix.primary or postfix.secondary %} # Les mailing-listes sont delivrees sur un serveur à part lists.crans.org smtp:[{{ query('ldap', 'ip', 'mailman', 'adm') | ipv4 | first }}] -{% endif %} -{% if postfix.primary or postfix.secondary %} # C'est le serveur des adherents qui fait les livraisons des # adresses clubs et adherents crans.org smtp:[users.adm.crans.org]