crans
/
ansible
mirror of http://gitlab.adm.crans.org/nounous/ansible.git
19
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cachan is now legacy 

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
certbot_on_virtu
Yohann D'ANELLO 2022-04-04 16:15:52 +02:00
parent 26d992cc72
commit 821ddcb9b9
Signed by: _ynerant
GPG Key ID: 3A75C55819C8CF85
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
group_vars/reverseproxy.yml
View File

@ -96,10 +96,6 @@ glob_reverseproxy:
- {from: tv.crans.org, to: wiki.crans.org/CransTv} - {from: tv.crans.org, to: wiki.crans.org/CransTv}
- {from: wikipedia.crans.org, to: wiki.crans.org} - {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: static_sites:
- autoconfig.crans.org - autoconfig.crans.org
- install-party.crans.org - install-party.crans.org

4
roles/postfix/templates/postfix/main.cf.j2
View File

@ -20,13 +20,13 @@ mynetworks = 127.0.0.0/8, [::1]/128
# Destinations acceptees # Destinations acceptees
mydestination = {{ ansible_hostname }}, $myhostname, localhost, localhost.$mydomain mydestination = {{ ansible_hostname }}, $myhostname, localhost, localhost.$mydomain
{% if postfix.primary or not postfix.secondary %} {% 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 %} {% endif %}
# Domaine relaye par ce MX # Domaine relaye par ce MX
relay_domains = $mydestination relay_domains = $mydestination
lists.$mydomain lists.$mydomain
{% if postfix.secondary %} {% 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 %} {% endif %}
# Etre notifie ou non de l'arrive de nouveaux mails # Etre notifie ou non de l'arrive de nouveaux mails
{% if postfix.primary or postfix.secondary %} {% if postfix.primary or postfix.secondary %}

4
roles/postfix/templates/postfix/transport.j2
View File

@ -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 # C'est le serveur des adherents qui fait les livraisons des
# adresses clubs et adherents # adresses clubs et adherents
crans.org smtp:[users.adm.crans.org] 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.eu smtp:[users.adm.crans.org]
crans.fr smtp:[users.adm.crans.org] crans.fr smtp:[users.adm.crans.org]
{% endif %} {% endif %}
@ -18,6 +15,5 @@ wanadoo.com slow:
wanadoo.fr slow: wanadoo.fr slow:
orange.com slow: orange.com slow:
orange.fr slow: orange.fr slow:
ens-cachan.fr slow:
free.fr slow: free.fr slow:
laposte.net slow: laposte.net slow: