Merge develop into staging, 2024 Mar 07 edition

config/nginx/conf.d/cantusdb.conf.development

@@ -1,41 +1,9 @@
 # This file is configured for deployment of the CantusDB project in local development.
 # When building the project locally, replace the contents of cantusdb.conf with the
 # contents of this file.
-
-# server {
-#     listen 80;
-# 
-#     server_tokens off;
-# 
-#     location ^~ /.well-known/acme-challenge/ {
-#         root /var/www/lego;
-#     }
-# 
-#     location / {
-#         return 301 https://$host$request_uri;
-#     }
-# }
-
-# server {
-#     # Redirect all https traffic for mass.cantusdatabase.org to cantusdatabase.org
-#     listen 443 ssl;
-# 
-#     server_name mass.cantusdatabase.org;
-# 
-#     ssl_certificate /etc/nginx/ssl/live/certificates/cantusdatabase.org.crt;
-#     ssl_certificate_key /etc/nginx/ssl/live/certificates/cantusdatabase.org.key;
-# 
-#     location / {
-#         return 301 https://cantusdatabase.org$request_uri;
-#     }
-# }
 
 server {
-    # listen 443 default_server http2 ssl;
     listen 80;
-
-    # ssl_certificate /etc/nginx/ssl/live/certificates/cantusdatabase.org.crt;
-    # ssl_certificate_key /etc/nginx/ssl/live/certificates/cantusdatabase.org.key;
 
     location / {
         proxy_pass http://django:8000;

config/nginx/conf.d/cantusdb.conf.production

@@ -31,10 +31,10 @@ server {
 }
 
 server {
-    listen 443 default_server http2 ssl;
+    listen 443 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;
 
@@ -56,7 +56,7 @@ server {
         alias /resources/api_cache/concordances.json;
         expires modified +24h;
     }
- 
+
     location = /style.css {
         root /;
     }
@@ -79,3 +79,18 @@ server {
         root /;
     }
 }
+
+# Default server to block requests to IP address and non-valid hostnames
+server {
+    access_log off; 
+    server_name _;
+
+    listen 80 default_server;
+    listen 443 default_server;
+    ssl_reject_handshake on;
+
+    # Close connection immediately for requests that don't match a defined
+    # server name
+    return 444;
+}
+

config/nginx/conf.d/cantusdb.conf.staging

@@ -21,11 +21,8 @@ server {
     # The Staging server's subdomain "staging-alias" is analogous to Production's "mass" subdomain.)
     listen 443 ssl;
 
-    # server_name mass.cantusdatabase.org;
     server_name staging-alias.cantusdatabase.org;
 
-    # ssl_certificate /etc/nginx/ssl/live/certificates/cantusdatabase.org.crt;
-    # ssl_certificate_key /etc/nginx/ssl/live/certificates/cantusdatabase.org.key;
     ssl_certificate /etc/nginx/ssl/live/certificates/staging.cantusdatabase.org.crt;
     ssl_certificate_key /etc/nginx/ssl/live/certificates/staging.cantusdatabase.org.key;
 
@@ -35,12 +32,10 @@ server {
 }
 
 server {
-    listen 443 default_server http2 ssl;
+    listen 443 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;
+
     ssl_certificate /etc/nginx/ssl/live/certificates/staging.cantusdatabase.org.crt;
     ssl_certificate_key /etc/nginx/ssl/live/certificates/staging.cantusdatabase.org.key;
 
@@ -62,7 +57,7 @@ server {
         alias /resources/api_cache/concordances.json;
         expires modified +24h;
     }
- 
+
     location = /style.css {
         root /;
     }
@@ -85,3 +80,17 @@ server {
         root /;
     }
 }
+
+# Default server to block requests to IP address and non-valid hostnames
+server {
+    access_log off; 
+    server_name _;
+
+    listen 80 default_server;
+    listen 443 default_server;
+    ssl_reject_handshake on;
+
+    # Close connection immediately for requests that don't match a defined
+    # server name
+    return 444;
+}

django/cantusdb_project/main_app/admin.py

@@ -21,6 +21,8 @@
 READ_ONLY = (
     "created_by",
     "last_updated_by",
+    "date_created",
+    "date_updated",
 )
 
 
@@ -61,10 +63,7 @@ def get_source_siglum(self, obj):
         "id",
     )
 
-    readonly_fields = READ_ONLY + (
-        "date_created",
-        "date_updated",
-    )
+    readonly_fields = READ_ONLY + ("incipit",)
 
     list_filter = (
         "genre",
@@ -170,6 +169,7 @@ def get_source_siglum(self, obj):
         "source",
         "feast",
     )
+    readonly_fields = READ_ONLY + ("incipit",)
     ordering = ("source__siglum",)
     form = AdminSequenceForm