Simplify Nginx config

This commit is contained in:
Oliver Davies 2017-12-06 21:45:13 +00:00
parent 0238b5e32f
commit 0b142d11e3

View file

@ -1,27 +1,7 @@
ssl_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/oliverdavies.uk/privkey.pem;
server { server {
listen 80; listen 80;
server_name http://oliverdavies.uk; server_name _;
server_name http://www.oliverdavies.uk;
return 301 https://www.oliverdavies.uk$request_uri;
}
server {
listen 443 ssl;
server_name oliverdavies.uk;
return 301 https://www.oliverdavies.uk$request_uri;
}
server {
listen 443 ssl;
server_name www.oliverdavies.uk;
root /app; root /app;
@ -159,4 +139,3 @@ server {
rewrite '^/talks/sculpin/?$' /talks/building-static-websites-sculpin permanent; rewrite '^/talks/sculpin/?$' /talks/building-static-websites-sculpin permanent;
rewrite "^/terms-and-conditions/?$" /terms permanent; rewrite "^/terms-and-conditions/?$" /terms permanent;
} }