Revert "chore(nginx): simplify vhost configuration"
This reverts commit c96c8be84c
.
This commit is contained in:
parent
3962c85566
commit
6b72d8a722
|
@ -394,7 +394,23 @@ map $uri $new_uri {
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 8080;
|
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;
|
||||||
|
|
||||||
server_name www.oliverdavies.uk;
|
server_name www.oliverdavies.uk;
|
||||||
root /srv/oliverdavies.uk;
|
root /srv/oliverdavies.uk;
|
||||||
|
@ -402,6 +418,9 @@ server {
|
||||||
|
|
||||||
error_page 404 /404.html;
|
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 / {
|
location / {
|
||||||
try_files $uri $uri.html $uri/index.html =404;
|
try_files $uri $uri.html $uri/index.html =404;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue