diff --git a/README.md b/README.md index ca0e834..121d37c 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,6 @@ c'est le rôle de la CI (Github Actions, ...), pas de nos playbooks. - [ ] Setup watchghost - [ ] C'est quoi pycon.afpy.org ? - [ ] C'est quoi video.pycon.fr ? (IN A 91.121.116.118) -- [ ] videos-2015.pycon.fr. ## deb.afpy.org @@ -77,7 +76,8 @@ Liste des jails toujours utiles : C'est un directory listing nginx, accessible via https://dl.afpy.org. -Il héberge aussi https://videos-2015.pycon.fr/. +Il héberge aussi https://videos-2015.pycon.fr/ (qui depuis 2021 redirige +vers dl.afpy.org/pycon-fr-15, c'est mieux rangé). # Ansible diff --git a/dl.yml b/dl.yml index a345197..de69c8a 100644 --- a/dl.yml +++ b/dl.yml @@ -69,12 +69,31 @@ server { listen 80; - server_name dl.afpy.org videos-2015.pycon.fr; + server_name dl.afpy.org; access_log /var/log/nginx/http-access.log; error_log /var/log/nginx/http-error.log; return 301 https://$host$request_uri; } + server + { + listen 80; + server_name videos-2015.pycon.fr; + access_log /var/log/nginx/http-access.log; + error_log /var/log/nginx/http-error.log; + return 301 https://dl.afpy.org/pycon-fr-15$request_uri; + } + + server + { + listen 443 ssl; + server_name videos-2015.pycon.fr; + access_log /var/log/nginx/videos-2015.pycon.fr-access.log; + error_log /var/log/nginx/videos-2015.pycon.fr-error.log; + include snippets/letsencrypt-dl.afpy.org.conf; + return 301 https://dl.afpy.org/pycon-fr-15$request_uri; + } + server { listen 443 ssl; @@ -90,19 +109,3 @@ fancyindex on; } } - - server - { - listen 443 ssl; - server_name videos-2015.pycon.fr; - access_log /var/log/nginx/videos-2015.pycon.fr-access.log; - error_log /var/log/nginx/videos-2015.pycon.fr-error.log; - include snippets/letsencrypt-dl.afpy.org.conf; - - root /var/www/videos-2015.pycon.fr/; - - location / - { - index index.html; - } - }