Revert "[nginx] Add service_nginx intermediary variable"

This reverts commit 26e65bb7bc.

group_vars/constellation_front.yml

@@ -1,5 +1,5 @@
 ---
-service_nginx:
+loc_nginx:
   service_name: constellation
   ssl: []
   servers:

group_vars/django_cas.yml

@@ -16,7 +16,7 @@ glob_django_cas:
     host: "{{ query('ldap', 'ip', 'redisdead', 'adm') | ipv4 | first }}"
     port: 25
 
-service_nginx:
+loc_nginx:
   service_name: "cas"
   ssl: []
   servers:

group_vars/gitlab.yml

@@ -20,17 +20,5 @@ glob_gitlab:
     address: "{{ query('ldap', 'ip', 'redisdead', 'adm') | first }}"
     port: 25
 
-service_nginx:
-  ssl:
-    - name: adm.crans.org
-      cert: /etc/letsencrypt/live/adm.crans.org/fullchain.pem
-      cert_key: /etc/letsencrypt/live/adm.crans.org/privkey.pem
-      trusted_cert: /etc/letsencrypt/live/adm.crans.org/chain.pem
-    - name: crans.org
-      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
-  servers: []
-
 glob_irker:
   name: GitlabBot

group_vars/jitsi.yml

@@ -1,6 +1,6 @@
 ---
 # We use embedded Jitsi configuration
-service_nginx:
+loc_nginx:
   servers: []
 
 glob_jitsi:

group_vars/mailman.yml

@@ -1,14 +1,9 @@
 ---
-service_nginx:
+loc_nginx:
   service_name: mailman3
   upstreams:
     - name: mailman3
       server: "unix:/run/mailman3-web/uwsgi.sock fail_timeout=0"
-  default_server: lists.crans.org
-  default_ssl_server: lists.crans.org
-  auth_passwd:
-    Stop: "$apr1$NXaV5H7Q$J3ora3Jo5h775Y1nm93PN1"
-  deploy_robots_file: true
   servers:
     - ssl: false
       server_name:

group_vars/roundcube.yml

@@ -31,7 +31,7 @@ glob_roundcube:
     larry: https://www.crans.org/images/crans_banner.png
     classic: https://www.crans.org/images/crans_banner.png
 
-service_nginx:
+loc_nginx:
   service_name: "roundcube"
   ssl: []
   servers:

group_vars/thelounge.yml

@@ -24,24 +24,3 @@ glob_thelounge:
     filter: "(objectclass=inetOrgPerson)"
     base: "dc=crans,dc=org"
     scope: "sub"
-
-service_nginx:
-  service_name: "thelounge"
-  servers:
-    - server_name:
-        - "irc.crans.org"
-        - "irc"
-      default: true
-      ssl: crans.org
-      locations:
-        - filter: "^~ /web/"
-          params:
-            - "proxy_pass http://localhost:9000/"
-            - "include \"/etc/nginx/snippets/options-proxypass.conf\""
-        - filter: "~ ^/$"
-          params:
-            - "return 302 https://irc.crans.org/web/"
-        - filter: "/"
-          params:
-            - "return 302 \"https://wiki.crans.org/VieCrans/UtiliserIrc#Via_l.27interface_web\""
-

group_vars/wiki.yml

@@ -2,7 +2,7 @@
 glob_moinmoin:
   main: false
 
-service_nginx:
+loc_nginx:
   service_name: wiki
   ssl: []
   servers:

host_vars/irc.adm.crans.org.yml

@@ -3,6 +3,26 @@ interfaces:
   adm: ens18
   srv: ens19
 
+loc_nginx:
+  service_name: "thelounge"
+  servers:
+    - server_name:
+        - "irc.crans.org"
+        - "irc"
+      default: true
+      ssl: crans.org
+      locations:
+        - filter: "^~ /web/"
+          params:
+            - "proxy_pass http://localhost:9000/"
+            - "include \"/etc/nginx/snippets/options-proxypass.conf\""
+        - filter: "~ ^/$"
+          params:
+            - "return 302 https://irc.crans.org/web/"
+        - filter: "/"
+          params:
+            - "return 302 \"https://wiki.crans.org/VieCrans/UtiliserIrc#Via_l.27interface_web\""
+
 loc_thelounge:
   public: "true"
 

plays/cas.yml

@@ -5,7 +5,7 @@
 - hosts: django_cas
   vars:
     django_cas: "{{ glob_django_cas | default({}) | combine(loc_django_cas | default({})) }}"
-    nginx: '{{ glob_nginx | default({}) | combine(service_nginx | default({}) | combine(loc_nginx | default({}))) }}'
+    nginx: "{{ glob_nginx | default({}) | combine(loc_nginx | default({})) }}"
   roles:
     - django-cas
     - nginx

plays/constellation.yml

@@ -9,7 +9,7 @@
 - hosts: constellation_front
   vars:
     constellation: "{{ glob_constellation | combine(loc_constellation | default({}), recursive=True) }}"
-    nginx: '{{ glob_nginx | default({}) | combine(service_nginx | default({}) | combine(loc_nginx | default({}))) }}'
+    nginx: "{{ glob_nginx | combine(loc_nginx | default({})) }}"
   roles:
     - nginx
     - constellation-front

plays/gitlab.yml

@@ -15,7 +15,7 @@
     gitlab: '{{ glob_gitlab | default({}) | combine(loc_gitlab | default({}), recursive=True) }}'
     irker: '{{ glob_irker | default({}) | combine(loc_irker | default({})) }}'
     mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}'
-    nginx: '{{ glob_nginx | default({}) | combine(service_nginx | default({}) | combine(loc_nginx | default({}))) }}'
+    nginx: '{{ glob_nginx | default({}) | combine(loc_nginx | default({})) }}'
     reverseproxy: '{{ glob_reverseproxy | default({}) | combine(loc_reverseproxy | default({})) }}'
   roles:
     - certbot

plays/irc.yml

@@ -9,7 +9,7 @@
 - hosts: thelounge,!adh_server
   vars:
     certbot: '{{ loc_certbot | default(glob_certbot | default([])) }}'
-    nginx: '{{ glob_nginx | default({}) | combine(service_nginx | default({}) | combine(loc_nginx | default({}))) }}'
+    nginx: '{{ glob_nginx | default({}) | combine(loc_nginx | default({})) }}'
   roles:
     - certbot
     - nginx

plays/jitsi.yml

@@ -3,7 +3,7 @@
 - hosts: jitsi
   vars:
     certbot: '{{ loc_certbot | default(glob_certbot | default([])) }}'
-    nginx: '{{ glob_nginx | default({}) | combine(service_nginx | default({}) | combine(loc_nginx | default({}))) }}'
+    nginx: '{{ glob_nginx | default({}) | combine(loc_nginx | default({})) }}'
     jitsi: '{{ glob_jitsi | default({}) | combine(loc_jitsi | default({})) }}'
   roles:
     - certbot

plays/mailman.yml

@@ -5,7 +5,7 @@
   vars:
     certbot: '{{ loc_certbot | default(glob_certbot | default([])) }}'
     mailman3: '{{ glob_mailman3 | default({}) | combine(loc_mailman3 | default({})) }}'
-    nginx: '{{ glob_nginx | default({}) | combine(service_nginx | default({}) | combine(loc_nginx | default({}))) }}'
+    nginx: '{{ glob_nginx | default({}) | combine(loc_nginx | default({})) }}'
     opendkim: '{{ glob_opendkim | combine(loc_opendkim | default({})) }}'
   roles:
     - certbot

plays/moinmoin.yml

@@ -10,7 +10,7 @@
 - hosts: wiki
   vars:
     moinmoin: '{{ glob_moinmoin | default({}) | combine(loc_moinmoin | default({})) }}'
-    nginx: '{{ glob_nginx | default({}) | combine(service_nginx | default({}) | combine(loc_nginx | default({}))) }}'
+    nginx: '{{ glob_nginx | default({}) | combine(loc_nginx | default({})) }}'
   roles:
     - moinmoin
     - nginx

plays/reverse-proxy.yml

@@ -3,7 +3,7 @@
 - hosts: reverseproxy
   vars:
     certbot: '{{ loc_certbot | default(glob_certbot | default([])) }}'
-    nginx: '{{ glob_nginx | default({}) | combine(service_nginx | default({}) | combine(loc_nginx | default({}))) }}'
+    nginx: '{{ glob_nginx | default({}) | combine(loc_nginx | default({})) }}'
     reverseproxy: '{{ glob_reverseproxy | default({}) | combine(loc_reverseproxy | default({})) }}'
   roles:
     - certbot

plays/roundcube.yml

@@ -3,7 +3,7 @@
 
 - hosts: roundcube
   vars:
-    nginx: '{{ glob_nginx | default({}) | combine(service_nginx | default({}) | combine(loc_nginx | default({}))) }}'
+    nginx: '{{ glob_nginx | default({}) | combine(loc_nginx | default({})) }}'
     roundcube: '{{ glob_roundcube | default({}) | combine(loc_roundcube | default({})) }}'
   roles:
     - roundcube