From 821ddcb9b92c8fa500424955b4fb22aabad55f0e Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Mon, 4 Apr 2022 16:15:52 +0200
Subject: [PATCH] Cachan is now legacy
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
group_vars/reverseproxy.yml | 4 ----
roles/postfix/templates/postfix/main.cf.j2 | 4 ++--
roles/postfix/templates/postfix/transport.j2 | 4 ----
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/group_vars/reverseproxy.yml b/group_vars/reverseproxy.yml
index 23a0791f..1d358aa1 100644
--- a/group_vars/reverseproxy.yml
+++ b/group_vars/reverseproxy.yml
@@ -96,10 +96,6 @@ glob_reverseproxy:
- {from: tv.crans.org, to: wiki.crans.org/CransTv}
- {from: wikipedia.crans.org, to: wiki.crans.org}
- # ENS Cachan
- - {from: crans.ens-cachan.fr, to: www.crans.org}
- - {from: install-party.ens-cachan.fr, to: install-party.crans.org}
-
static_sites:
- autoconfig.crans.org
- install-party.crans.org
diff --git a/roles/postfix/templates/postfix/main.cf.j2 b/roles/postfix/templates/postfix/main.cf.j2
index 091677c8..74dd64d6 100644
--- a/roles/postfix/templates/postfix/main.cf.j2
+++ b/roles/postfix/templates/postfix/main.cf.j2
@@ -20,13 +20,13 @@ mynetworks = 127.0.0.0/8, [::1]/128
# Destinations acceptees
mydestination = {{ ansible_hostname }}, $myhostname, localhost, localhost.$mydomain
{% if postfix.primary or not postfix.secondary %}
- $mydomain, crans.ens-cachan.fr, clubs.ens-cachan.fr, install-party.ens-cachan.fr, crans.fr, crans.eu
+ $mydomain, crans.fr, crans.eu
{% endif %}
# Domaine relaye par ce MX
relay_domains = $mydestination
lists.$mydomain
{% if postfix.secondary %}
- $mydomain, crans.ens-cachan.fr, clubs.ens-cachan.fr, install-party.ens-cachan.fr, crans.fr, crans.eu
+ $mydomain, crans.fr, crans.eu
{% endif %}
# Etre notifie ou non de l'arrive de nouveaux mails
{% if postfix.primary or postfix.secondary %}
diff --git a/roles/postfix/templates/postfix/transport.j2 b/roles/postfix/templates/postfix/transport.j2
index 87cd249d..a2830e07 100644
--- a/roles/postfix/templates/postfix/transport.j2
+++ b/roles/postfix/templates/postfix/transport.j2
@@ -7,9 +7,6 @@ lists.crans.org smtp:[{{ query('ldap', 'ip', 'mailman', 'adm') | ip
# C'est le serveur des adherents qui fait les livraisons des
# adresses clubs et adherents
crans.org smtp:[users.adm.crans.org]
-crans.ens-cachan.fr smtp:[users.adm.crans.org]
-install-party.ens-cachan.fr smtp:[users.adm.crans.org]
-clubs.ens-cachan.fr smtp:[users.adm.crans.org]
crans.eu smtp:[users.adm.crans.org]
crans.fr smtp:[users.adm.crans.org]
{% endif %}
@@ -18,6 +15,5 @@ wanadoo.com slow:
wanadoo.fr slow:
orange.com slow:
orange.fr slow:
-ens-cachan.fr slow:
free.fr slow:
laposte.net slow:
--
GitLab