cfp-2024 → cfp

ponyconf.yml

@@ -5,8 +5,6 @@
     ponyconf_sites:
       - domain: 'cfp-2023.pycon.fr'
         authenticator: gandi
-      - domain: 'cfp-2024.pycon.fr'
-        authenticator: gandi
     ponyconf_user: ponyconf
     ponyconf_home: "/home/{{ ponyconf_user }}"
     ponyconf_imap_password: !vault |
@@ -41,25 +39,25 @@
         home: "{{ ponyconf_home }}"
         system: true
 
-    - name: PonyConf nginx redirection
+    - name: cfp-2024 is now a pretalx instance
       include_role: name=nginx
       vars:
-        nginx_domain: "cfp.pycon.fr"
-        nginx_certificates: ["cfp.pycon.fr"]
+        nginx_domain: "cfp-2024.pycon.fr"
+        nginx_certificates: ["cfp-2024.pycon.fr"]
         nginx_conf: |
           server
           {
               listen [::]:80; listen 80;
-              server_name cfp.pycon.fr;
-              return 301 https://cfp-2023.pycon.fr$request_uri;
+              server_name cfp-2024.pycon.fr;
+              return 301 https://$host$request_uri;
           }
 
           server
           {
               listen [::]:443 ssl http2; listen 443 ssl http2;
-              server_name cfp.pycon.fr;
-              include snippets/letsencrypt-cfp.pycon.fr.conf;
-              return 301 https://cfp-2023.pycon.fr$request_uri;
+              server_name cfp-2024.pycon.fr;
+              include snippets/letsencrypt-cfp-2024.pycon.fr.conf;
+              return 301 https://cfp.pycon.fr$request_uri;
           }
 
     - name: PonyConf nginx config