Switch from julienpalard.static_website to more flexible julienpalard.nginx

afpy.org.yml

@@ -32,18 +32,38 @@
       notify: reload nginx
 
     - name: Setup afpy.org
-      include_role: name=julienpalard.static_website
+      include_role: name=julienpalard.nginx
       vars:
-        owner: afpy-org
-        domain: afpy.org
-        extra_certificates: [www.afpy.org]
-        nginx_extra: |
-          location / {
+        nginx_owner: afpy-org
+        nginx_domain: afpy.org
+        nginx_certificates: [afpy.org, www.afpy.org]
+        nginx_conf: |
+          server
+          {
+              listen 80;
+              server_name .afpy.org;
+              access_log /var/log/nginx/afpy.org-access.log;
+              error_log /var/log/nginx/afpy.org-error.log;
+              return 301 https://$host$request_uri;
+          }
+
+          server
+          {
+              listen 443 ssl;
+              server_name .afpy.org;
+              access_log /var/log/nginx/afpy.org-access.log;
+              error_log /var/log/nginx/afpy.org-error.log;
+              root /var/www/afpy.org/;
+              include snippets/letsencrypt-afpy.org.conf;
+              index index.html;
+              location /
+              {
                   include proxy_params;
                   proxy_pass http://unix:/run/afpy-org/website.sock;
               }
 
-          location /static/ {
+              location /static/
+              {
                   alias /home/afpy-org/src/static/;
               }
 
@@ -80,6 +100,7 @@
               location = "/news/atelier-contribuez-a-la-traduction-de-la-doc-de-python-en-francais" { return 301 https://www.afpy.org/posts/actualites/1515405342; }
               location = "/news/soiree-python-a-marseille-le-9-2-2018" { return 301 https://www.afpy.org/posts/actualites/1518042512; }
               location = "/news/meetup-python-amiens-1" { return 301 https://www.afpy.org/posts/actualites/1523519011; }
+          }
 
     - name: afpy user can reload own website
       lineinfile:

pycon.fr.yml

@@ -8,29 +8,33 @@
       include_role: name=common
 
     - name: Setup PyConFr 2010
-      include_role: name=julienpalard.static_website
+      include_role: name=julienpalard.nginx
       vars:
-        owner: pyconfr2010
-        domain: 2010.pycon.fr
-        path: /var/www/2010.pycon.fr/
+        nginx_owner: pyconfr2010
+        nginx_domain: 2010.pycon.fr
+        nginx_certificates: [2010.pycon.fr]
+        nginx_path: /var/www/2010.pycon.fr/
 
     - name: Setup PyConFr 2011
-      include_role: name=julienpalard.static_website
+      include_role: name=julienpalard.nginx
       vars:
-        owner: pyconfr2011
-        domain: 2011.pycon.fr
-        path: /var/www/2011.pycon.fr/
+        nginx_owner: pyconfr2011
+        nginx_domain: 2011.pycon.fr
+        nginx_certificates: [2011.pycon.fr]
+        nginx_path: /var/www/2011.pycon.fr/
 
     - name: Setup PyConFr 2012
-      include_role: name=julienpalard.static_website
+      include_role: name=julienpalard.nginx
       vars:
-        owner: pyconfr2012
-        domain: 2012.pycon.fr
-        path: /var/www/2012.pycon.fr/
+        nginx_owner: pyconfr2012
+        nginx_domain: 2012.pycon.fr
+        nginx_certificates: [2012.pycon.fr]
+        nginx_path: /var/www/2012.pycon.fr/
 
     - name: Setup sigal of paullaroid.pycon.fr
-      include_role: name=julienpalard.static_website
+      include_role: name=julienpalard.nginx
       vars:
-        owner: paullaroid
-        domain: paullaroid.pycon.fr
-        path: /var/www/paullaroid.pycon.fr/
+        nginx_owner: paullaroid
+        nginx_domain: paullaroid.pycon.fr
+        nginx_certificates: [paullaroid.pycon.fr]
+        nginx_path: /var/www/paullaroid.pycon.fr/

requirements.yml

@@ -1,6 +1,6 @@
 ---
 roles:
-  - src: julienpalard.static_website
+  - src: julienpalard.nginx
     version: master
   - src: tschifftner.exim4_sendonly
     version: master