Merge pull request #1315 from jacobdgm/1289-server_names

Specify server names in nginx configuration
DDMAL · Feb 16, 2024 · 3b650b1 · 3b650b1
2 parents 8121aba + c0f9064
commit 3b650b1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/config/nginx/conf.d/cantusdb.conf.production b/config/nginx/conf.d/cantusdb.conf.production
@@ -1,6 +1,9 @@
 server {
+    # Redirect all http traffic to corresponding https page
     listen 80;
 
+    server_name cantusdatabase.org www.cantusdatabase.org mass.cantusdatabase.org;
+
     server_tokens off;
 
     location ^~ /.well-known/acme-challenge/ {
@@ -13,10 +16,11 @@ server {
 }
 
 server {
-    # Redirect all https traffic for mass.cantusdatabase.org to cantusdatabase.org
+    # Redirect all https traffic for www.cantusdatabase.org and mass.cantusdatabase.org
+    # to cantusdatabase.org
     listen 443 ssl;
 
-    server_name mass.cantusdatabase.org;
+    server_name www.cantusdatabase.org mass.cantusdatabase.org;
 
     ssl_certificate /etc/nginx/ssl/live/certificates/cantusdatabase.org.crt;
     ssl_certificate_key /etc/nginx/ssl/live/certificates/cantusdatabase.org.key;
@@ -27,8 +31,9 @@ server {
 }
 
 server {
-
     listen 443 default_server http2 ssl;
+
+    server_name cantusdatabase.org;
 
     ssl_certificate /etc/nginx/ssl/live/certificates/cantusdatabase.org.crt;
     ssl_certificate_key /etc/nginx/ssl/live/certificates/cantusdatabase.org.key;

diff --git a/config/nginx/conf.d/cantusdb.conf.staging b/config/nginx/conf.d/cantusdb.conf.staging
@@ -1,6 +1,9 @@
 server {
+    # redirect all http traffic to corresponding https page
     listen 80;
 
+    server_name staging.cantusdatabase.org staging-alias.cantusdatabase.org;
+
     server_tokens off;
 
     location ^~ /.well-known/acme-challenge/ {
@@ -32,8 +35,9 @@ server {
 }
 
 server {
-
     listen 443 default_server http2 ssl;
+
+    server_name staging.cantusdatabase.org;
 
     # ssl_certificate /etc/nginx/ssl/live/certificates/cantusdatabase.org.crt;
     # ssl_certificate_key /etc/nginx/ssl/live/certificates/cantusdatabase.org.key;