Skip to content

Commit

Permalink
update local dev conf to serve media files (#1117)
Browse files Browse the repository at this point in the history
Co-authored-by: Jake Rosenberg <[email protected]>
  • Loading branch information
jarosenb and Jake Rosenberg authored Oct 26, 2023
1 parent 1aa78da commit 680bc2a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
10 changes: 5 additions & 5 deletions conf/docker/docker-compose-dev.all.debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 6 additions & 2 deletions conf/nginx/nginx.debug.conf
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,22 @@ 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 {
internal;
alias /corral-repl/tacc/NHERI/;
}

location /media {
alias /srv/www/designsafe/media;
}

location / {
proxy_pass http://django:8000/;
proxy_set_header Host $host;
Expand Down

0 comments on commit 680bc2a

Please sign in to comment.