Skip to content
Snippets Groups Projects
Commit 9a01dd59 authored by shirenn's avatar shirenn 🌊
Browse files

[reverse_proxy] Adds hodaur and clean role

parent 6ad08d99
No related branches found
No related tags found
1 merge request!56Reverse proxy + first vm migration
Hide whitespace changes
Inline Side-by-side
group_vars/reverse_proxy.yml 0 → 100644
+ 42
− 0
View file @ 9a01dd59
reverse_proxy:
contact: "contact@crans.org"
who: "l'équipe technique du Cr@ns"
ssl:
cert: /etc/letsencrypt/live/crans.org/fullchain.pem
cert_key: /etc/letsencrypt/live/crans.org/privkey.pem
trusted_cert: /etc/letsencrypt/live/crans.org/chain.pem
redirect_dnames:
- crans.org
- crans.eu
- crans.fr
reverseproxy_sites:
# Services web Crans
- {from: lutim, to: 10.231.136.69}
# - {from: zero, to: 10.231.136.76}
# - {from: pad, to: "10.231.136.76:9001"}
# - {from: ethercalc, to: "10.231.136.203:8000"}
# - {from: mediadrop, to: 10.231.136.106}
# - {from: videos, to: 10.231.136.106}
# - {from: video, to: 10.231.136.106}
# - {from: roundcube, to: 10.231.136.105}
# - {from: phabricator, to: 10.231.136.123}
# - {from: trackerusercontent, to: 10.231.136.123}
# - {from: cas, to: 10.231.136.18}
# - {from: auth, to: 10.231.136.18}
# - {from: login, to: 10.231.136.18}
# - {from: webmail, to: 10.231.136.107}
# - {from: horde, to: 10.231.136.107}
# - {from: owncloud, to: 10.231.136.26}
# - {from: ftps, to: 10.231.136.98}
# - {from: wiki, to: 10.231.136.204}
# - {from: calendrier, to: 10.231.136.204}
# - {from: www, to: 10.231.136.46}
# - {from: doc, to: 10.231.136.46}
# - {from: limesurvey, to: 10.231.136.253}
# - {from: perso, to: 10.231.136.1}
# - {from: webnews, to: 10.231.136.63}
# - {from: re2o, to: 10.231.136.9}
# - {from: intranet, to: 10.231.136.9}
# - {from: autoconfig, to: 10.231.136.46}
group_vars/reverseproxy.yml 0 → 100644
+ 74
− 0
View file @ 9a01dd59
nginx:
contact: contact@crans.org
who: "l'équipe technique du Cr@ns"
ssl:
cert: /etc/letsencrypt/live/crans.org/fullchain.pem
cert_key: /etc/letsencrypt/live/crans.org/privkey.pem
trusted_cert: /etc/letsencrypt/live/crans.org/chain.pem
redirect_dnames:
- crans.eu
- crans.fr
reverseproxy_sites: []
# # Services web Crans
# - {from: lutim.crans.org, to: 10.231.136.69}
# - {from: zero.crans.org, to: 10.231.136.76}
# - {from: pad.crans.org, to: "10.231.136.76:9001"}
# - {from: ethercalc.crans.org, to: "10.231.136.203:8000"}
# - {from: mediadrop.crans.org, to: 10.231.136.106}
# - {from: videos.crans.org, to: 10.231.136.106}
# - {from: video.crans.org, to: 10.231.136.106}
# - {from: roundcube.crans.org, to: 10.231.136.105}
# - {from: phabricator.crans.org, to: 10.231.136.123}
# - {from: trackerusercontent.crans.org, to: 10.231.136.123}
# - {from: cas.crans.org, to: 10.231.136.18}
# - {from: auth.crans.org, to: 10.231.136.18}
# - {from: login.crans.org, to: 10.231.136.18}
# - {from: webmail.crans.org, to: 10.231.136.107}
# - {from: horde.crans.org, to: 10.231.136.107}
# - {from: owncloud.crans.org, to: 10.231.136.26}
# - {from: ftps.crans.org, to: 10.231.136.98}
# - {from: wiki.crans.org, to: 10.231.136.204}
# - {from: www.crans.org, to: 10.231.136.46}
# - {from: doc.crans.org, to: 10.231.136.46}
# - {from: limesurvey.crans.org, to: 10.231.136.253}
# - {from: perso.crans.org, to: 10.231.136.1}
# - {from: webnews.crans.org, to: 10.231.136.63}
# - {from: re2o.crans.org, to: 10.231.136.9}
# - {from: intranet.crans.org, to: 10.231.136.9}
# - {from: autoconfig.crans.org, to: 10.231.136.46}
# - {from: grafana.crans.org, to: "10.231.136.102:3000"}
# - {from: webirc.crans.org, to: "10.231.136.1:9000"}
# - {from: framadate.crans.org, to: 10.231.136.153}
# - {from: mailman.crans.org, to: 10.231.136.180}
#
# # Zamok
# - {from: install-party.crans.org, to: 10.231.136.1}
# - {from: med.crans.org, to: 10.231.136.1}
# - {from: med-cartons.crans.org, to: 10.231.136.1}
# - {from: amap.crans.org, to: 10.231.136.1}
# - {from: pot-vieux.crans.org, to: 10.231.136.1}
# - {from: bonvivens.crans.org, to: 10.231.136.1}
#
redirect_sites: []
# - {from: crans.org, to: www.crans.org}
#
# # Aliases or legacy support
# - {from: factures.crans.org, to: intranet.crans.org}
# - {from: accounts.crans.org, to: intranet.crans.org}
# - {from: intranet2.crans.org, to: intranet.crans.org}
# - {from: clubs.crans.org, to: perso.crans.org}
# - {from: task.crans.org, to: phabricator.crans.org}
# - {from: adopteunpingouin.crans.org, to: install-party.crans.org}
# - {from: i-p.crans.org, to: install-party.crans.org}
#
# # To the wiki
# - {from: wikipedia.crans.org, to: wiki.crans.org}
# - {from: wifi.crans.org, to: wiki.crans.org/CransD%C3%A9marrage}
# - {from: television.crans.org, to: wiki.crans.org/CransTv}
# - {from: tv.crans.org, to: wiki.crans.org/CransTv}
#
# # ENS Cachan
# - {from: crans.ens-cachan.fr, to: www.crans.org}
# - {from: install-party.ens-cachan.fr, to: install-party.crans.org}
hosts
+ 5
− 0
View file @ 9a01dd59
......@@ -25,6 +25,10 @@
# [test_vm]
# re2o-test.adm.crans.org
[reverseproxy]
hodaur.adm.crans.org
frontdaur.adm.crans.org
[radius]
routeur-sam.adm.crans.org
......@@ -72,6 +76,7 @@ routeur-sam.adm.crans.org
routeur-daniel.adm.crans.org
belenios # on changera plus tard
re2o-ldap.adm.crans.org
hodaur.adm.crans.org
[ovh_physical]
sputnik.adm.crans.org
......
plays/reverse-proxy.yml
+ 3
− 51
View file @ 9a01dd59
#!/usr/bin/env ansible-playbook
---
# Deploy reverse proxy
# Frontdaur is the backup of bakdaur (keepalived)
- hosts: bakdaur.adm.crans.org,frontdaur.adm.crans.org
vars:
certbot:
dns_rfc2136_name: certbot_challenge.
dns_rfc2136_secret: "{{ vault_certbot_dns_secret }}"
mail: root@crans.org
certname: crans.org
domains: "crans.org, *.crans.org, crans.fr, *.crans.fr, crans.eu, *.crans.eu"
bind:
masters: "{{ lookup('re2oapi', 'get_role', 'dns-authoritary-master')[0] }}"
nginx:
ssl:
cert: /etc/letsencrypt/live/crans.org/fullchain.pem
cert_key: /etc/letsencrypt/live/crans.org/privkey.pem
trusted_cert: /etc/letsencrypt/live/crans.org/chain.pem
redirect_dnames:
- crans.eu
- crans.fr
reverseproxy_sites:
# Services web Crans
- {from: lutim.crans.org, to: 10.231.136.69}
- {from: zero.crans.org, to: 10.231.136.76}
- {from: pad.crans.org, to: "10.231.136.76:9001"}
- {from: ethercalc.crans.org, to: "10.231.136.203:8000"}
- {from: mediadrop.crans.org, to: 10.231.136.106}
- {from: videos.crans.org, to: 10.231.136.106}
- {from: video.crans.org, to: 10.231.136.106}
- {from: roundcube.crans.org, to: 10.231.136.105}
- {from: phabricator.crans.org, to: 10.231.136.123}
- {from: trackerusercontent.crans.org, to: 10.231.136.123}
- {from: cas.crans.org, to: 10.231.136.18}
- {from: auth.crans.org, to: 10.231.136.18}
- {from: login.crans.org, to: 10.231.136.18}
- {from: webmail.crans.org, to: 10.231.136.107}
- {from: horde.crans.org, to: 10.231.136.107}
- {from: owncloud.crans.org, to: 10.231.136.26}
- {from: ftps.crans.org, to: 10.231.136.98}
- {from: wiki.crans.org, to: 10.231.136.204}
- {from: calendrier.crans.org, to: 10.231.136.204}
- {from: www.crans.org, to: 10.231.136.46}
- {from: doc.crans.org, to: 10.231.136.46}
- {from: limesurvey.crans.org, to: 10.231.136.253}
- {from: perso.crans.org, to: 10.231.136.1}
- {from: webnews.crans.org, to: 10.231.136.63}
- {from: re2o.crans.org, to: 10.231.136.9}
- {from: intranet.crans.org, to: 10.231.136.9}
- {from: autoconfig.crans.org, to: 10.231.136.46}
- hosts: reverseproxy
roles:
- nginx-reverseproxy
roles/nginx-reverseproxy/tasks/main.yml
+ 1
− 6
View file @ 9a01dd59
......@@ -15,16 +15,10 @@
- options-ssl.conf
- options-proxypass.conf
- name: Has dhparam been copied?
stat:
path: /etc/letsencrypt/dhparam
register: stat_result
- name: Copy dhparam
template:
src: letsencrypt/dhparam.j2
dest: /etc/letsencrypt/dhparam
when: not stat_result.stat.exists
- name: Copy reverse proxy sites
template:
......@@ -46,6 +40,7 @@
- reverseproxy_redirect_dname
- redirect
notify: Reload nginx
ignore_errors: "{{ ansible_check_mode }}"
- name: Copy 50x error page
template:
......
roles/nginx-reverseproxy/templates/www/html/50x.html.j2
+ 1
− 1
View file @ 9a01dd59
......@@ -57,7 +57,7 @@
<h1>502</h1>
<p>Whoops, le service prend trop de temps à répondre…</p>
<p>Essayez de rafraîchir la page. Si le problème persiste, pensez
à contacter <a href="mailto:contact@crans.org">l'équipe technique du Cr@ns</a>.</p>
à contacter <a href="mailto:{{ nginx.contact }}">{{ nginx.who }}</a>.</p>
</body>
</html>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment