[reverseproxy] variables and dirty things

group_vars/reverse_proxy.yml

@@ -1,42 +0,0 @@
-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

@@ -17,8 +17,8 @@ nginx:
     - crans.eu
     - crans.fr
 
-  reverseproxy_sites: []
-    #    # Services web Crans
+  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"}
@@ -47,7 +47,7 @@ nginx:
     #    - {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: framadate.crans.org, to: 172.16.10.109}
     #    - {from: mailman.crans.org, to: 10.231.136.180}
     #
     #    # Zamok

roles/certbot/tasks/main.yml

@@ -12,7 +12,9 @@
 
 - name: Lookup DNS masters IPv4
   set_fact:
-    dns_masters_ipv4: "{{ bind.masters | json_query('servers[].interface[?vlan_id==`2`].ipv4[]') }}"
+    #dns_masters_ipv4: "{{ bind.masters | json_query('servers[].interface[?vlan_id==`2`].ipv4[]') }}"
+    dns_masters_ipv4:
+      - "185.230.79.9"
     cacheable: true
 
 - name: Add DNS credentials