Prefer www.pycon.fr over pycon.fr.

This commit is contained in:
Julien Palard 2019-12-19 15:58:06 +01:00
parent 601afe5b09
commit b78562c984

View File

@ -18,16 +18,35 @@
server
{
listen 80;
server_name pycon.fr www.pycon.fr;
server_name pycon.fr;
access_log /var/log/nginx/pycon.fr-access.log;
error_log /var/log/nginx/pycon.fr-error.log;
return 301 https://$host$request_uri;
return 301 https://www.pycon.fr$request_uri;
}
server
{
listen 80;
server_name www.pycon.fr;
access_log /var/log/nginx/pycon.fr-access.log;
error_log /var/log/nginx/pycon.fr-error.log;
return 301 https://www.pycon.fr$request_uri;
}
server
{
listen 443 ssl;
server_name pycon.fr www.pycon.fr;
server_name pycon.fr;
access_log /var/log/nginx/pycon.fr-access.log;
error_log /var/log/nginx/pycon.fr-error.log;
include snippets/letsencrypt-pycon.fr.conf;
return 301 https://www.pycon.fr$request_uri;
}
server
{
listen 443 ssl;
server_name www.pycon.fr;
access_log /var/log/nginx/pycon.fr-access.log;
error_log /var/log/nginx/pycon.fr-error.log;
include snippets/letsencrypt-pycon.fr.conf;
@ -52,7 +71,7 @@
server_name 2012.pycon.fr;
access_log /var/log/nginx/2012.pycon.fr-access.log;
error_log /var/log/nginx/2012.pycon.fr-error.log;
return 301 https://pycon.fr/2012/;
return 301 https://www.pycon.fr/2012/;
}
server
@ -62,7 +81,7 @@
access_log /var/log/nginx/2012.pycon.fr-access.log;
error_log /var/log/nginx/2012.pycon.fr-error.log;
include snippets/letsencrypt-2012.pycon.fr.conf;
return 301 https://pycon.fr/2012/;
return 301 https://www.pycon.fr/2012/;
}
- name: Setup PyConFr 2011
@ -77,7 +96,7 @@
server_name 2011.pycon.fr;
access_log /var/log/nginx/2011.pycon.fr-access.log;
error_log /var/log/nginx/2011.pycon.fr-error.log;
return 301 https://pycon.fr/2011/;
return 301 https://www.pycon.fr/2011/;
}
server
@ -87,7 +106,7 @@
access_log /var/log/nginx/2011.pycon.fr-access.log;
error_log /var/log/nginx/2011.pycon.fr-error.log;
include snippets/letsencrypt-2011.pycon.fr.conf;
return 301 https://pycon.fr/2011/;
return 301 https://www.pycon.fr/2011/;
}
- name: Setup PyConFr 2010
@ -102,7 +121,7 @@
server_name 2010.pycon.fr;
access_log /var/log/nginx/2010.pycon.fr-access.log;
error_log /var/log/nginx/2010.pycon.fr-error.log;
return 301 https://pycon.fr/2010/;
return 301 https://www.pycon.fr/2010/;
}
server
@ -112,7 +131,7 @@
access_log /var/log/nginx/2010.pycon.fr-access.log;
error_log /var/log/nginx/2010.pycon.fr-error.log;
include snippets/letsencrypt-2010.pycon.fr.conf;
return 301 https://pycon.fr/2010/;
return 301 https://www.pycon.fr/2010/;
}
- name: Setup sigal of paullaroid.pycon.fr
@ -135,7 +154,7 @@
server_name fr.pycon.org;
access_log /var/log/nginx/fr.pycon.org-access.log;
error_log /var/log/nginx/fr.pycon.org-error.log;
return 301 https://pycon.fr/;
return 301 https://www.pycon.fr/;
}
server
@ -145,5 +164,5 @@
access_log /var/log/nginx/fr.pycon.org-access.log;
error_log /var/log/nginx/fr.pycon.org-error.log;
include snippets/letsencrypt-fr.pycon.org.conf;
return 301 https://pycon.fr/;
return 301 https://www.pycon.fr/;
}