Merge branch 'master' into joeywildman-ruby3.2.2

autolab · Jan 3, 2024 · 8496aab · 8496aab
2 parents 9d2fa1a + a53d148
commit 8496aab
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 14 deletions.
diff --git a/Autolab b/Autolab
diff --git a/nginx/app.conf.template b/nginx/app.conf.template
@@ -40,16 +40,35 @@ server {
 
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
 
-    # Set max client body size for assessments and autograders
-    # regex matches one or more alpha-numeric characters and the hyphen '-'
+    # Increase max client body size for upload routes
+    # [\w|-]+ regex matches one or more alpha-numeric characters and the hyphen '-'
+
+    # Import assessment from tarball
     location ~* /courses/[\w|-]+/assessments/importAsmtFromTar {
         client_max_body_size 1G;
     }
 
+    # Autograder files (Makefile / Tar)
     location ~* /courses/[\w|-]+/assessments/[\w|-]+/autograder.\d+ {
         client_max_body_size 1G;
     }
 
+    # Course attachments
+    location ~* /courses/[\w|-]+/attachments {
+        client_max_body_size 1G;
+    }
+
+    # Assessment attachments
+    location ~* /courses/[\w|-]+/assessments/[\w|-]+/attachments {
+        client_max_body_size 1G;
+    }
+
+    # Assessment handin
+    location ~* /courses/[\w|-]+/assessments/[\w|-]+/handin {
+        client_max_body_size 1G;
+    }
+
+    # Docker image upload
     location ~* /courses/[\w|-]+/dockers/uploadDockerImage {
         client_max_body_size 10G;
     }

diff --git a/nginx/no-ssl-app.conf.template b/nginx/no-ssl-app.conf.template
@@ -6,17 +6,36 @@ server {
   passenger_user app;
   passenger_ruby /usr/bin/ruby3.2;
 
-  # Set max client body size for assessments and autograders
-  # regex matches one or more alpha-numeric characters and the hyphen '-'
-  location ~* /courses/[\w|-]+/assessments/importAsmtFromTar {
-    client_max_body_size 1G;
-  }
+    # Increase max client body size for upload routes
+    # [\w|-]+ regex matches one or more alpha-numeric characters and the hyphen '-'
 
-  location ~* /courses/[\w|-]+/assessments/[\w|-]+/autograder.\d+ {
-    client_max_body_size 1G;
-  }
+    # Import assessment from tarball
+    location ~* /courses/[\w|-]+/assessments/importAsmtFromTar {
+        client_max_body_size 1G;
+    }
 
-  location ~* /courses/[\w|-]+/dockers/uploadDockerImage {
-    client_max_body_size 10G;
-  }
+    # Autograder files (Makefile / Tar)
+    location ~* /courses/[\w|-]+/assessments/[\w|-]+/autograder.\d+ {
+        client_max_body_size 1G;
+    }
+
+    # Course attachments
+    location ~* /courses/[\w|-]+/attachments {
+        client_max_body_size 1G;
+    }
+
+    # Assessment attachments
+    location ~* /courses/[\w|-]+/assessments/[\w|-]+/attachments {
+        client_max_body_size 1G;
+    }
+
+    # Assessment handin
+    location ~* /courses/[\w|-]+/assessments/[\w|-]+/handin {
+        client_max_body_size 1G;
+    }
+
+    # Docker image upload
+    location ~* /courses/[\w|-]+/dockers/uploadDockerImage {
+        client_max_body_size 10G;
+    }
 }