me/breccia-mapper
1
0
Fork 0
mirror of https://github.com/Southampton-RSG/breccia-mapper.git synced 2026-03-03 03:17:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] attempting to make media folder hosting work

Browse Source
This commit is contained in:
Matthew Grove
2023-01-07 19:31:49 +00:00
parent 2a08ddba45
commit 011a01d176
5 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Caddyfile
View File

@@ -4,6 +4,7 @@
@proxy_paths { @proxy_paths {
not path /static/* not path /static/*
not path /media/*
} }
reverse_proxy @proxy_paths http://server:8000 reverse_proxy @proxy_paths http://server:8000

2
breccia_mapper/settings.py
View File

@@ -279,7 +279,7 @@ STATIC_ROOT = BASE_DIR.joinpath('static')
STATICFILES_DIRS = [BASE_DIR.joinpath('breccia_mapper', 'static')] STATICFILES_DIRS = [BASE_DIR.joinpath('breccia_mapper', 'static')]
# Media uploads # Media uploads
MEDIA_ROOT = BASE_DIR.joinpath('breccia_mapper', 'media') MEDIA_ROOT = BASE_DIR.joinpath('media')
MEDIA_URL = "/media/" MEDIA_URL = "/media/"
# Logging - NB the logger name is empty to capture all output # Logging - NB the logger name is empty to capture all output

3
deploy/templates/Caddyfile.j2
View File

@@ -1,9 +1,10 @@
http://* { :80 :443 {
root * /srv root * /srv
file_server file_server
@proxy_paths { @proxy_paths {
not path /static/* not path /static/*
not path /media/*
} }
reverse_proxy @proxy_paths http://server:8000 reverse_proxy @proxy_paths http://server:8000

3
deploy/templates/docker-compose.yml.j2
View File

@@ -14,6 +14,7 @@ services:
volumes: volumes:
- {{ project_dir }}/db.sqlite3:/app/db.sqlite3:z - {{ project_dir }}/db.sqlite3:/app/db.sqlite3:z
- static_files:/app/static - static_files:/app/static
- media_files:/app/media
caddy: caddy:
image: caddy:2 image: caddy:2
@@ -26,6 +27,7 @@ services:
- ./Caddyfile:/etc/caddy/Caddyfile:z - ./Caddyfile:/etc/caddy/Caddyfile:z
# Caddy serves static files collected by Django # Caddy serves static files collected by Django
- static_files:/srv/static:ro - static_files:/srv/static:ro
- media_files:/srv/media:ro
- caddy_data:/data - caddy_data:/data
- caddy_config:/config - caddy_config:/config
depends_on: depends_on:
@@ -35,3 +37,4 @@ volumes:
caddy_data: caddy_data:
caddy_config: caddy_config:
static_files: static_files:
media_files:

3
docker-compose.yml
View File

@@ -14,6 +14,7 @@ services:
volumes: volumes:
- ./db.sqlite3:/app/db.sqlite3:z - ./db.sqlite3:/app/db.sqlite3:z
- static_files:/app/static - static_files:/app/static
- media_files:/app/media
caddy: caddy:
image: caddy:2 image: caddy:2
@@ -26,6 +27,7 @@ services:
- ./Caddyfile:/etc/caddy/Caddyfile:z - ./Caddyfile:/etc/caddy/Caddyfile:z
# Caddy serves static files collected by Django # Caddy serves static files collected by Django
- static_files:/srv/static:ro - static_files:/srv/static:ro
- media_files:/srv/media:ro
- caddy_data:/data - caddy_data:/data
- caddy_config:/config - caddy_config:/config
depends_on: depends_on:
@@ -35,3 +37,4 @@ volumes:
caddy_data: caddy_data:
caddy_config: caddy_config:
static_files: static_files:
media_files: