From b085b774ad5c5aa99da35b12fce27af78dc85e1e Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Sun, 7 Mar 2021 19:07:40 +0100
Subject: [PATCH] [mailman] variable postfix.mailman is now useless
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
host_vars/boeing.adm.crans.org.yml | 1 -
host_vars/redisdead.adm.crans.org.yml | 1 -
host_vars/sputnik.adm.crans.org.yml | 1 -
roles/postfix/templates/postfix/transport.j2 | 4 +---
4 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/host_vars/boeing.adm.crans.org.yml b/host_vars/boeing.adm.crans.org.yml
index fe9d1c69..882cb80d 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 8228a1d0..999c2eb4 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 7e6ff41c..0ad18335 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 954c3b01..87cd249d 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]
--
GitLab