From b5b64ab7f313a0c72ef24b27cf75fd1e6ba46365 Mon Sep 17 00:00:00 2001
From: godd0t <lirrishala@gmail.com>
Date: Wed, 10 May 2023 16:06:30 +0200
Subject: [PATCH] fix nginx media serve

---
 deployment/scripts/nginx/nginx-media.conf     | 14 ++++++++++
 .../nginx/{nginx.conf => nginx-static.conf}   | 10 -------
 docker-compose.prod.yml                       | 26 ++++++++++++-------
 3 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 deployment/scripts/nginx/nginx-media.conf
 rename deployment/scripts/nginx/{nginx.conf => nginx-static.conf} (51%)

diff --git a/deployment/scripts/nginx/nginx-media.conf b/deployment/scripts/nginx/nginx-media.conf
new file mode 100644
index 0000000..50cd6a5
--- /dev/null
+++ b/deployment/scripts/nginx/nginx-media.conf
@@ -0,0 +1,14 @@
+events {}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    server {
+        listen 80;
+        location /media {
+            autoindex on;
+            alias /usr/src/app/media/;
+        }
+    }
+}
diff --git a/deployment/scripts/nginx/nginx.conf b/deployment/scripts/nginx/nginx-static.conf
similarity index 51%
rename from deployment/scripts/nginx/nginx.conf
rename to deployment/scripts/nginx/nginx-static.conf
index 4a87375..567f375 100644
--- a/deployment/scripts/nginx/nginx.conf
+++ b/deployment/scripts/nginx/nginx-static.conf
@@ -3,8 +3,6 @@ events {}
 http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
-    access_log    /var/log/nginx/access.log;
-    error_log     /var/log/nginx/error.log;
 
     server {
         listen 80;
@@ -13,12 +11,4 @@ http {
             alias /usr/src/app/static/;
         }
     }
-
-    server {
-        listen 80;
-        location /media {
-            autoindex on;
-            alias /usr/src/app/media/;
-        }
-    }
 }
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 9627240..6627e85 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -67,20 +67,29 @@ services:
     container_name: "${APP_NAME}-celery-beat"
     command: [ "/bin/sh", "/app/deployment/scripts/celery/start-beat.sh" ]
 
-  nginx:
+  nginx-static:
     image: nginx:latest
-    container_name: "${APP_NAME}-nginx"
+    container_name: "${APP_NAME}-nginx-static"
     volumes:
-      - ./deployment/scripts/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./deployment/scripts/nginx/nginx-static.conf:/etc/nginx/nginx.conf:ro
       - static_files:/usr/src/app/static
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.${APP_NAME}-nginx-static.rule=Host(`${APP_HOST}`) && PathPrefix(`/static`)"
+      - "traefik.http.routers.${APP_NAME}-nginx-static.entrypoints=web"
+      - "traefik.http.services.${APP_NAME}-nginx-static.loadbalancer.server.port=80"
+
+  nginx-media:
+    image: nginx:latest
+    container_name: "${APP_NAME}-nginx-media"
+    volumes:
+      - ./deployment/scripts/nginx/nginx-media.conf:/etc/nginx/nginx.conf:ro
       - media_files:/usr/src/app/media
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.${APP_NAME}-nginx.rule=Host(`${APP_HOST}`) && (PathPrefix(`/static`) || PathPrefix(`/media`))"
-      - "traefik.http.routers.${APP_NAME}-nginx.entrypoints=web"
-      - "traefik.http.services.${APP_NAME}-nginx.loadbalancer.server.port=80"
-    depends_on:
-      - backend
+      - "traefik.http.routers.${APP_NAME}-nginx-media.rule=Host(`${APP_HOST}`) && PathPrefix(`/media`)"
+      - "traefik.http.routers.${APP_NAME}-nginx-media.entrypoints=web"
+      - "traefik.http.services.${APP_NAME}-nginx-media.loadbalancer.server.port=80"
 
   traefik:
     image: traefik:v2.5
@@ -91,7 +100,6 @@ services:
       - "--entrypoints.web.address=:80"
       - "--entrypoints.web-secure.address=:443"
       - "--log.level=DEBUG"
-      - "--log.format=json"
       - "--log.filePath=/logs/traefik.log"
       - "--accesslog=true"
       - "--accesslog.filePath=/logs/access.log"