From 011a01d176e2c21c42426ca0b78448867fde5f1b Mon Sep 17 00:00:00 2001
From: Matthew Grove <me@mgrove.uk>
Date: Sat, 7 Jan 2023 19:31:49 +0000
Subject: [PATCH] [FIX] attempting to make media folder hosting work

---
 Caddyfile                              | 1 +
 breccia_mapper/settings.py             | 2 +-
 deploy/templates/Caddyfile.j2          | 3 ++-
 deploy/templates/docker-compose.yml.j2 | 3 +++
 docker-compose.yml                     | 3 +++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Caddyfile b/Caddyfile
index d5cc982..116752a 100755
--- a/Caddyfile
+++ b/Caddyfile
@@ -4,6 +4,7 @@
 
     @proxy_paths {
         not path /static/*
+        not path /media/*
     }
 
     reverse_proxy @proxy_paths http://server:8000
diff --git a/breccia_mapper/settings.py b/breccia_mapper/settings.py
index f164150..31c4ef6 100644
--- a/breccia_mapper/settings.py
+++ b/breccia_mapper/settings.py
@@ -279,7 +279,7 @@ STATIC_ROOT = BASE_DIR.joinpath('static')
 STATICFILES_DIRS = [BASE_DIR.joinpath('breccia_mapper', 'static')]
 
 # Media uploads
-MEDIA_ROOT = BASE_DIR.joinpath('breccia_mapper', 'media')
+MEDIA_ROOT = BASE_DIR.joinpath('media')
 MEDIA_URL = "/media/"
 
 # Logging - NB the logger name is empty to capture all output
diff --git a/deploy/templates/Caddyfile.j2 b/deploy/templates/Caddyfile.j2
index a5449da..116752a 100755
--- a/deploy/templates/Caddyfile.j2
+++ b/deploy/templates/Caddyfile.j2
@@ -1,9 +1,10 @@
-http://* {
+:80 :443 {
     root * /srv
     file_server
 
     @proxy_paths {
         not path /static/*
+        not path /media/*
     }
 
     reverse_proxy @proxy_paths http://server:8000
diff --git a/deploy/templates/docker-compose.yml.j2 b/deploy/templates/docker-compose.yml.j2
index 122d2a2..eaaabdc 100755
--- a/deploy/templates/docker-compose.yml.j2
+++ b/deploy/templates/docker-compose.yml.j2
@@ -14,6 +14,7 @@ services:
     volumes:
       - {{ project_dir }}/db.sqlite3:/app/db.sqlite3:z
       - static_files:/app/static
+      - media_files:/app/media
 
   caddy:
     image: caddy:2
@@ -26,6 +27,7 @@ services:
       - ./Caddyfile:/etc/caddy/Caddyfile:z
       # Caddy serves static files collected by Django
       - static_files:/srv/static:ro
+      - media_files:/srv/media:ro
       - caddy_data:/data
       - caddy_config:/config
     depends_on:
@@ -35,3 +37,4 @@ volumes:
   caddy_data:
   caddy_config:
   static_files:
+  media_files:
diff --git a/docker-compose.yml b/docker-compose.yml
index afe24f3..f03ac58 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,6 +14,7 @@ services:
     volumes:
       - ./db.sqlite3:/app/db.sqlite3:z
       - static_files:/app/static
+      - media_files:/app/media
 
   caddy:
     image: caddy:2
@@ -26,6 +27,7 @@ services:
       - ./Caddyfile:/etc/caddy/Caddyfile:z
       # Caddy serves static files collected by Django
       - static_files:/srv/static:ro
+      - media_files:/srv/media:ro
       - caddy_data:/data
       - caddy_config:/config
     depends_on:
@@ -35,3 +37,4 @@ volumes:
   caddy_data:
   caddy_config:
   static_files:
+  media_files: