diff --git a/nginx/oliverdavies.uk.conf b/nginx/oliverdavies.uk.conf index 08304551..9fa3b7f2 100644 --- a/nginx/oliverdavies.uk.conf +++ b/nginx/oliverdavies.uk.conf @@ -394,23 +394,7 @@ map $uri $new_uri { } server { - listen 80 default_server; - - server_name _; - - return 301 https://$host$request_uri; -} - -server { - listen 443 ssl; - server_name oliverdavies.uk; - ssl_certificate /home/opdavies/.acme.sh/www.oliverdavies.uk/www.oliverdavies.uk.cer; - ssl_certificate_key /home/opdavies/.acme.sh/www.oliverdavies.uk/www.oliverdavies.uk.key; - return 301 $scheme://www.oliverdavies.uk$request_uri; -} - -server { - listen 443 ssl; + listen 8080; server_name www.oliverdavies.uk; root /srv/oliverdavies.uk; @@ -418,9 +402,6 @@ server { error_page 404 /404.html; - ssl_certificate /home/opdavies/.acme.sh/www.oliverdavies.uk/www.oliverdavies.uk.cer; - ssl_certificate_key /home/opdavies/.acme.sh/www.oliverdavies.uk/www.oliverdavies.uk.key; - location / { try_files $uri $uri.html $uri/index.html =404; }