From 559f77545dc072073332f975b1c51c0cca33af97 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sun, 31 Dec 2017 15:07:22 +0100 Subject: [PATCH] move the media root and add support for MEDIA_URL --- Vagrantfile | 3 +++ django/didgeridoo/didgeridoo/settings.py | 5 ++++- django/didgeridoo/didgeridoo/urls.py | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index dc33c61..f32fe7a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -35,6 +35,9 @@ Vagrant.configure("2") do |config| #Copy the apache configuration for django to the correct place cp /vagrant/apache/000-default.conf /etc/apache2/sites-available/ + mkdir /srv/media + chmod -R 777 /srv/media + #restart the webserver systemctl restart apache2.service diff --git a/django/didgeridoo/didgeridoo/settings.py b/django/didgeridoo/didgeridoo/settings.py index 3c31a02..b811f2a 100644 --- a/django/didgeridoo/didgeridoo/settings.py +++ b/django/didgeridoo/didgeridoo/settings.py @@ -68,6 +68,7 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', + 'django.template.context_processors.media' ], }, }, @@ -132,6 +133,8 @@ USE_TZ = True STATIC_URL = '/static/' STATIC_ROOT = '/vagrant/django/didgeridoo/static/' -MEDIA_ROOT = '/vagrant/django/didgeridoo/media/' + +MEDIA_URL = '/media/' +MEDIA_ROOT = '/srv/media/' LOGIN_REDIRECT_URL = '/' diff --git a/django/didgeridoo/didgeridoo/urls.py b/django/didgeridoo/didgeridoo/urls.py index 1eef47b..be44997 100644 --- a/django/didgeridoo/didgeridoo/urls.py +++ b/django/didgeridoo/didgeridoo/urls.py @@ -15,9 +15,11 @@ Including another URLconf """ from django.conf.urls import include, url from django.contrib import admin +from django.conf import settings +from django.conf.urls.static import static urlpatterns = [ url(r'', include('webshop.urls')), url(r'^admin/', admin.site.urls), url(r'^admin/', admin.site.urls), -] +] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)