diff --git a/cmd/nginx/nginx.conf b/cmd/nginx/nginx.conf index 1ccb1c6..6b2fd8c 100644 --- a/cmd/nginx/nginx.conf +++ b/cmd/nginx/nginx.conf @@ -41,20 +41,5 @@ http { ssl_stapling_verify on; ssl_ecdh_curve secp384r1; - server { - listen 80; - server_name _; - - root /usr/share/nginx/html; - - # do not redirect requests letsencrypt - location /.well-known/ {} - - # the default location redirects to https - location / { - return 301 https://$host$request_uri; - } - } - include /etc/nginx/conf.d/*.conf; } diff --git a/cmd/nginx/podsync.conf b/cmd/nginx/podsync.conf index a0840e8..d85fd06 100644 --- a/cmd/nginx/podsync.conf +++ b/cmd/nginx/podsync.conf @@ -7,10 +7,27 @@ upstream backend { } server { - listen 443; - server_name _; + listen 80; + listen 443 ssl; + + server_name www.podsync.net; + + ssl_certificate SSL_CERT; + ssl_certificate_key SSL_KEY; + + return 301 $scheme://podsync.net$request_uri; +} + +server { + listen 80; + listen 443 ssl; + + server_name podsync.net; + + root /usr/share/nginx/html; + + location /.well-known/ {} - ssl on; ssl_certificate SSL_CERT; ssl_certificate_key SSL_KEY;