Use Django to serve static files in debug mode (#1186)

* Use Django to serve static files in debug mode * clean up volumes; remove local nginx static and media locations * add back /data/media mount * add media back to nginx; same locations as main --------- Co-authored-by: Sal Tijerina <[email protected]>
DesignSafe-CI · Mar 27, 2024 · a6a9fec · a6a9fec
1 parent aa7e405
commit a6a9fec
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/bin/run-django.sh b/bin/run-django.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 # run django dev server as designsafe community account
-python -m debugpy --listen 0.0.0.0:5678 manage.py runserver --noasgi 0.0.0.0:8000
+python -m debugpy --listen 0.0.0.0:5678 manage.py runserver 0.0.0.0:8000
diff --git a/conf/docker/docker-compose-dev.all.debug.m1.yml b/conf/docker/docker-compose-dev.all.debug.m1.yml
@@ -73,10 +73,9 @@ services:
       - ../nginx/certificates/designsafe.dev.crt:/etc/ssl/designsafe.dev.crt
       - ../nginx/certificates/designsafe.dev.key:/etc/ssl/designsafe.dev.key
       - ../nginx/dhparam.pem:/etc/ssl/dhparam.pem
-      - ../../.:/srv/www/designsafe
       - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI
-      - ../../static:/var/www/designsafe/static
-      - ../../media:/var/www/designsafe/media
+      - ../../.:/srv/www/designsafe
+      - ../../data/media:/srv/www/designsafe/media
     links:
       - django:django
     ports:
@@ -95,6 +94,7 @@ services:
       - elasticsearch:elasticsearch
     volumes:
       - ../../.:/srv/www/designsafe
+      - ../../data/media:/srv/www/designsafe/media
       - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI
     ports:
       - 127.0.0.1:5678:5678
@@ -110,6 +110,7 @@ services:
     env_file: ../env_files/designsafe.env
     volumes:
       - ../../.:/srv/www/designsafe
+      - ../../data/media:/srv/www/designsafe/media
       - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI
     container_name: des_websockets
     command: python manage.py runserver 0.0.0.0:9000
@@ -124,6 +125,7 @@ services:
       - elasticsearch:elasticsearch
     volumes:
       - ../../.:/srv/www/designsafe
+      - ../../data/media:/srv/www/designsafe/media
       - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI
     dns:
       - 8.8.8.8

diff --git a/conf/docker/docker-compose-dev.all.debug.yml b/conf/docker/docker-compose-dev.all.debug.yml
@@ -70,8 +70,8 @@ services:
       - ../nginx/certificates/designsafe.dev.key:/etc/ssl/designsafe.dev.key
       - ../nginx/dhparam.pem:/etc/ssl/dhparam.pem
       - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI
-      - ../../static:/var/www/designsafe/static
-      - ../../media:/var/www/designsafe/media
+      - ../../.:/srv/www/designsafe
+      - ../../data/media:/srv/www/designsafe/media
     links:
       - django:django
     ports:
@@ -90,6 +90,7 @@ services:
       - elasticsearch:elasticsearch
     volumes:
       - ../../.:/srv/www/designsafe
+      - ../../data/media:/srv/www/designsafe/media
       - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI
     ports:
       - 127.0.0.1:5678:5678
@@ -105,6 +106,7 @@ services:
     env_file: ../env_files/designsafe.env
     volumes:
       - ../../.:/srv/www/designsafe
+      - ../../data/media:/srv/www/designsafe/media
       - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI
     container_name: des_websockets
     command: python manage.py runserver 0.0.0.0:9000
@@ -119,6 +121,7 @@ services:
       - elasticsearch:elasticsearch
     volumes:
       - ../../.:/srv/www/designsafe
+      - ../../data/media:/srv/www/designsafe/media
       - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI
     dns:
       - 8.8.8.8

diff --git a/conf/nginx/nginx.debug.conf b/conf/nginx/nginx.debug.conf
@@ -57,13 +57,12 @@ http {
         ssl_protocols               TLSv1 TLSv1.1 TLSv1.2;
         ssl_ciphers                 "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
 
-
         location /favicon.ico {
-            alias /var/www/designsafe/static/favicon.ico;
+            alias /srv/www/designsafe/designsafe/static/favicon.ico;
         }
 
         location /robots.txt {
-            alias /var/www/designsafe/robots.txt;
+            alias /srv/www/designsafe/conf/nginx/robots.txt;
         }
 
         location /internal-resource {
@@ -72,11 +71,7 @@ http {
         }
 
         location /media {
-            alias /var/www/designsafe/media;
-        }
-
-        location /static {
-            alias /var/www/designsafe/static;
+            alias /srv/www/designsafe/media;
         }
 
         location / {
@@ -86,7 +81,6 @@ http {
             proxy_redirect off;
         }
 
-
         location /ws {
             proxy_pass http://portal_ws;
             proxy_http_version 1.1;