diff --git a/nginx/sites-available/default.conf b/nginx/sites-available/default.conf index 48252a3..b7fa82f 100644 --- a/nginx/sites-available/default.conf +++ b/nginx/sites-available/default.conf @@ -1,3 +1,17 @@ +# www to non-www redirect -- duplicate content is BAD: +# https://github.com/h5bp/html5-boilerplate/blob/5370479476dceae7cc3ea105946536d6bc0ee468/.htaccess#L362 +# Choose between www and non-www, listen on the *wrong* one and redirect to +# the right one -- http://wiki.nginx.org/Pitfalls#Server_Name +server { + # don't forget to tell on which port this server listens + listen 80; + # listen on the www host + server_name www.example.com; + + # and redirect to the non-www host (declared below) + return 301 $scheme://example.com$request_uri; +} + server { # listen 80 default_server deferred; # for Linux # listen 80 default_server accept_filter=httpready; # for FreeBSD diff --git a/nginx/sites-available/www-redirect.conf b/nginx/sites-available/www-redirect.conf deleted file mode 100644 index d8dd4d8..0000000 --- a/nginx/sites-available/www-redirect.conf +++ /dev/null @@ -1,13 +0,0 @@ -# www to non-www redirect -- duplicate content is BAD: -# https://github.com/h5bp/html5-boilerplate/blob/5370479476dceae7cc3ea105946536d6bc0ee468/.htaccess#L362 -# Choose between www and non-www, listen on the *wrong* one and redirect to -# the right one -- http://wiki.nginx.org/Pitfalls#Server_Name -server { - # don't forget to tell on which port this server listens - listen 80; - # listen on the www host - server_name www.example.com; - - # and redirect to the non-www host (declared below) - return 301 $scheme://example.com$request_uri; -}