From 680bc2acd75d7fb097ca62d83ebcb6f7ce83d37c Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Thu, 26 Oct 2023 15:02:54 -0500 Subject: [PATCH] update local dev conf to serve media files (#1117) Co-authored-by: Jake Rosenberg --- conf/docker/docker-compose-dev.all.debug.yml | 10 +++++----- conf/nginx/nginx.debug.conf | 8 ++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/conf/docker/docker-compose-dev.all.debug.yml b/conf/docker/docker-compose-dev.all.debug.yml index 64d03f00fb..ff7d5979ae 100644 --- a/conf/docker/docker-compose-dev.all.debug.yml +++ b/conf/docker/docker-compose-dev.all.debug.yml @@ -71,8 +71,8 @@ services: - ../nginx/dhparam.pem:/etc/ssl/dhparam.pem - ../../.:/srv/www/designsafe - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - - ../../data/static:/var/www/designsafe-ci.org/static - - ../../data/media:/var/www/designsafe-ci.org/media + - ../../data/static:/srv/www/designsafe/static + - ../../data/media:/srv/www/designsafe/media links: - django:django ports: @@ -93,7 +93,7 @@ services: - ../../.:/srv/www/designsafe - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - ../../data/static:/var/www/designsafe-ci.org/static - - ../../data/media:/var/www/designsafe-ci.org/media + - ../../data/media:/srv/www/designsafe/media ports: - 127.0.0.1:8000:8000 - 127.0.0.1:5678:5678 @@ -116,8 +116,8 @@ services: volumes: - ../../.:/srv/www/designsafe - ~/corral-repl/tacc/NHERI:/corral-repl/tacc/NHERI - - ../../data/static:/var/www/designsafe-ci.org/static - - ../../data/media:/var/www/designsafe-ci.org/media + - ../../data/static:/srv/www/designsafe/static + - ../../data/media:/srv/www/designsafe/media dns: - 8.8.8.8 - 8.8.4.4 diff --git a/conf/nginx/nginx.debug.conf b/conf/nginx/nginx.debug.conf index b78e259a00..fc3ec05966 100644 --- a/conf/nginx/nginx.debug.conf +++ b/conf/nginx/nginx.debug.conf @@ -64,11 +64,11 @@ http { #} location /favicon.ico { - alias /var/www/designsafe-ci.org/static/favicon.ico; + alias /srv/www/designsafe/static/favicon.ico; } location /robots.txt { - alias /var/www/designsafe-ci.org/robots.txt; + alias /srv/www/designsafe/robots.txt; } location /internal-resource { @@ -76,6 +76,10 @@ http { alias /corral-repl/tacc/NHERI/; } + location /media { + alias /srv/www/designsafe/media; + } + location / { proxy_pass http://django:8000/; proxy_set_header Host $host;