From 0fdf7029e4c53f9fa4b335da2779b753fef8406b Mon Sep 17 00:00:00 2001 From: binaryDiv Date: Mon, 21 Oct 2019 01:49:37 +0200 Subject: [PATCH] #2: serve static and media files via nginx --- .deployment/nginx/nginx.conf | 8 ++++++++ .deployment/production/docker-compose.yml | 9 +++++++++ pluralityspace/settings.py | 8 +++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.deployment/nginx/nginx.conf b/.deployment/nginx/nginx.conf index 360a4c6..6df5104 100644 --- a/.deployment/nginx/nginx.conf +++ b/.deployment/nginx/nginx.conf @@ -11,4 +11,12 @@ server { proxy_set_header Host $host; proxy_redirect off; } + + location /staticfiles { + alias /srv/http/staticfiles; + } + + location /mediafiles { + alias /srv/http/mediafiles; + } } diff --git a/.deployment/production/docker-compose.yml b/.deployment/production/docker-compose.yml index cfb7507..1e5d9da 100644 --- a/.deployment/production/docker-compose.yml +++ b/.deployment/production/docker-compose.yml @@ -6,6 +6,8 @@ services: expose: - 8000 volumes: + - static_volume:/usr/src/app/staticfiles + - media_volume:/usr/src/app/mediafiles - /run/mysqld/:/run/mysqld/ env_file: - production.secrets.env @@ -14,5 +16,12 @@ services: build: ../nginx ports: - 8042:80 + volumes: + - static_volume:/srv/http/staticfiles + - media_volume:/srv/http/mediafiles depends_on: - django + +volumes: + static_volume: + media_volume: diff --git a/pluralityspace/settings.py b/pluralityspace/settings.py index a3efc8e..e85c224 100644 --- a/pluralityspace/settings.py +++ b/pluralityspace/settings.py @@ -121,4 +121,10 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/2.2/howto/static-files/ -STATIC_URL = '/static/' +STATIC_URL = "/staticfiles/" +STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles") + +# Media files (file uploads, user content, etc.) + +MEDIA_URL = "/mediafiles/" +MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles")