Merge pull request #108 from FSU-ACM/release

deployment updates

Author: mmcinnestaylor

deploy/prod/bastion/docker-swarm.yaml deploy/prod/bastion/docker-stack.yml

@@ -1,43 +1,55 @@
-upstream contestsuite_django {
-	server django:8000;
+upstream gunicorn {
+    server gunicorn:8000;
 }
-upstream contestsuite_flower {
-	server celery_flower:5555;
+upstream flower {
+    server celery_flower:5555;
 }
 
 server {
-	listen 80;
-	server_name contest.cs.fsu.edu;
+    listen 80;
+    server_name contest.cs.fsu.edu;
 
-	location / {
-		proxy_pass http://contestsuite_django;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    location = /robots.txt {
+        return 200 "User-agent: *\nDisallow: /flower/\n";
+    }
+
+    location / {
+        add_header Cache-Control "no-cache, no-store";
+
+        proxy_pass http://gunicorn;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $host;
+        proxy_redirect off;
+    }
+
+    location /static {
+        expires 1M;
+        add_header Cache-Control "public, no-transform";
+        
+        alias /usr/share/nginx/html/static/django;
+        sendfile on;
+        tcp_nopush on;        
+    }
+
+    location /flower {
+        add_header Cache-Control "no-cache, no-store";
+        add_header X-Robots-Tag "noindex" always;
+        
+        proxy_pass http://flower;
         proxy_set_header Host $host;
-		proxy_redirect off;
-	}
-
-	location /static {
-		aio on;
-		autoindex off;
-		alias /usr/share/nginx/html/static/django;
-		sendfile on;
-	}
-
-	location /flower {
-		proxy_pass http://contestsuite_flower;
-		proxy_set_header Host $host;
-		proxy_http_version 1.1;
-		proxy_set_header Upgrade $http_upgrade;
-		proxy_set_header Connection "upgrade";
-		proxy_redirect off;
-		add_header X-Robots-Tag "noindex" always;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_redirect off;
     }
 
-	location /flower/static {
-		aio on;
-		autoindex off;
-		alias /usr/share/nginx/html/static/flower;
-		sendfile on;
-		add_header X-Robots-Tag "noindex" always;
-	}
+    location /flower/static {
+        expires 6M;
+        add_header Cache-Control "public, no-transform";
+        add_header X-Robots-Tag "noindex" always;
+
+        alias /usr/share/nginx/html/static/flower;
+        sendfile on;
+        tcp_nopush on;        
+    }
 }

deploy/prod/contestsuite/config/nginx.conf

@@ -29,7 +29,7 @@ services:
                 delay: 5s
                 monitor: 60s
                 failure_action: rollback            
-    django:
+    gunicorn:
         image: acmfsu/contestsuite:latest
         command: /app/docker/start.sh server
         secrets:
@@ -261,6 +261,7 @@ services:
                 failure_action: rollback
     redis:
         image: redis:5-buster
+        command: redis-server --save 600 1 --loglevel warning
         environment:
             TZ: America/New_York
         volumes:

deploy/prod/contestsuite/docker-swarm.yaml deploy/prod/contestsuite/docker-stack.yml

@@ -12,7 +12,6 @@ services:
             JUDGEDAEMON_USERNAME: judgehost
             JUDGEDAEMON_PASSWORD_FILE: /run/secrets/domjudge_jh_password
             DOMSERVER_BASEURL: http://domserver/
-            DOMJUDGE_CREATE_WRITABLE_TEMP_DIR: 1
         volumes:  
             - /sys/fs/cgroup:/sys/fs/cgroup:ro
         networks:
@@ -28,7 +27,6 @@ services:
             JUDGEDAEMON_USERNAME: judgehost
             JUDGEDAEMON_PASSWORD_FILE: /run/secrets/bastion_jh_password
             DOMSERVER_BASEURL: http://domserver/
-            DOMJUDGE_CREATE_WRITABLE_TEMP_DIR: 1
         volumes:  
             - /sys/fs/cgroup:/sys/fs/cgroup:ro
         networks:

deploy/prod/domjudge/docker-swarm.yaml deploy/prod/domjudge/docker-stack.yml

@@ -110,6 +110,8 @@
                   target="_blank" rel="external noopener"><i class="fa-solid fa-file-circle-question fa-fw"></i> Example Questions</a>
                 <a class="dropdown-item" href="https://drive.google.com/drive/folders/1uCylEYyFdXdxD_BxplYZIioW6_ragXTq?usp=sharing"
                   target="_blank" rel="external noopener"><i class="fa-solid fa-book fa-fw"></i> Registration Guide</a>
+                <a class="dropdown-item" href="https://www.domjudge.org/docs/team-manual.pdf"
+                  target="_blank" rel="external noopener"><i class="fa-solid fa-book fa-fw"></i> Team Manual</a>
                 <a class="dropdown-item" href="https://bit.ly/JoinProgClub" target="_blank" rel="external noopener"><i class="fa-solid fa-people-group fa-fw"></i> Programming Club</a>
               </div>
             </li>

deploy/prod/judgehosts/docker-compose.yaml deploy/prod/judgehosts/docker-compose.yml

@@ -2,10 +2,6 @@
 {% load cache %}
 {% load static %}
 
-{% block head %}
-<link rel="stylesheet" type="text/css" href="{% static 'core/css/index.css' %}"/>
-{% endblock %}
-
 {% block title %}
 <title>ACM at FSU Programming Contest</title>
 {% endblock %}