From 069a19ec5f693cf9adb0489d133fc936d55f1ba9 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Thu, 6 Apr 2023 00:34:21 +0200
Subject: [PATCH] docker/production: change default static root, enable serving
 media by nginx

---
 docker/production/Dockerfile                  | 2 +-
 docker/production/docker-compose.yaml         | 7 ++++---
 docker/production/nginx/kompass.nginx.conf    | 6 +++++-
 jdav_web/jdav_web/settings/components/base.py | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
index 87764da..bf51753 100644
--- a/docker/production/Dockerfile
+++ b/docker/production/Dockerfile
@@ -8,7 +8,7 @@ RUN groupadd -g 501 app && useradd -g 501 -u 501 -m -d /app app
 
 # create static directory and set permissions, when doing this before mounting a named volume
 # in docker-compose.yaml, the permissions are inherited during the mount.
-RUN mkdir -p /var/www/jdav_web/assets && chown -R app:app /var/www/jdav_web/assets
+RUN mkdir -p /var/www/jdav_web/static && chown -R app:app /var/www/jdav_web/static
 
 # create static directory and set permissions, when doing this before mounting a named volume
 # in docker-compose.yaml, the permissions are inherited during the mount.
diff --git a/docker/production/docker-compose.yaml b/docker/production/docker-compose.yaml
index 0282f7d..feabdbe 100644
--- a/docker/production/docker-compose.yaml
+++ b/docker/production/docker-compose.yaml
@@ -19,15 +19,16 @@ services:
         volumes:
           - uwsgi_data:/tmp/uwsgi/
           - web_static:/app/static/
-          - web_static:/var/www/jdav_web/assets/
-          - ./media:/app/media/
+          - web_static:/var/www/jdav_web/static/
+          - ./media:/var/www/jdav_web/media/
 
     nginx:
         build: ./nginx/
         restart: always
         volumes:
           - uwsgi_data:/tmp/uwsgi/
-          - web_static:/var/www/jdav_web/assets/:ro
+          - web_static:/var/www/jdav_web/static/:ro
+          - ./media:/var/www/jdav_web/media/:ro
         ports:
           - "3000:80"
         depends_on:
diff --git a/docker/production/nginx/kompass.nginx.conf b/docker/production/nginx/kompass.nginx.conf
index a345e41..5b63859 100644
--- a/docker/production/nginx/kompass.nginx.conf
+++ b/docker/production/nginx/kompass.nginx.conf
@@ -8,7 +8,11 @@ server {
     charset utf-8;
 
     location /static {
-        alias /var/www/jdav_web/assets;
+        alias /var/www/jdav_web/static;
+    }
+
+    location /media {
+        alias /var/www/jdav_web/media;
     }
 
     location / {
diff --git a/jdav_web/jdav_web/settings/components/base.py b/jdav_web/jdav_web/settings/components/base.py
index 9db1446..f004e1d 100644
--- a/jdav_web/jdav_web/settings/components/base.py
+++ b/jdav_web/jdav_web/settings/components/base.py
@@ -127,7 +127,7 @@ STATICFILES_DIRS = [
 # use python3 manage.py collectstatic to collect static files in the STATIC_ROOT
 # this is needed for deployment
 STATIC_ROOT = os.environ.get('DJANGO_STATIC_ROOT',
-			     '/var/www/jdav_web/assets')
+			     '/var/www/jdav_web/static')
 
 
 # Locale files (translations)