From 7116b3378f61d666f483cb36e141a24f5f0609f4 Mon Sep 17 00:00:00 2001 From: Alex Leray Date: Tue, 10 Oct 2017 12:25:08 +0200 Subject: [PATCH] Moved media and static roots settings into local_settings --- relearn/local_settings.py.example | 13 ++++++++++++- relearn/settings.py | 10 ---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/relearn/local_settings.py.example b/relearn/local_settings.py.example index 3f3c8fb..f57d0ba 100644 --- a/relearn/local_settings.py.example +++ b/relearn/local_settings.py.example @@ -23,4 +23,15 @@ EMAIL_USE_TLS = True HOME_PAD = 'About.md' # You can use this if you want to run the project under a subfolder -# SUBFOLDER = '2015' \ No newline at end of file +# SUBFOLDER = '2015' + +# Absolute filesystem path to the directory that will hold user-uploaded files. +# Example: "/var/www/example.com/media/" +MEDIA_ROOT = '' + +# Absolute path to the directory static files should be collected to. +# Don't put anything in this directory yourself; store your static files +# in apps' "static/" subdirectories and in STATICFILES_DIRS. +# Example: "/var/www/example.com/static/" +STATIC_ROOT = '/home/osp/static-relearn-collected/' + diff --git a/relearn/settings.py b/relearn/settings.py index fa74b2c..ed0f0c5 100644 --- a/relearn/settings.py +++ b/relearn/settings.py @@ -42,21 +42,11 @@ USE_TZ = True SITE_ID = 1 -# Absolute filesystem path to the directory that will hold user-uploaded files. -# Example: "/var/www/example.com/media/" -MEDIA_ROOT = '' - # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash. # Examples: "http://example.com/media/", "http://media.example.com/" MEDIA_URL = '/media/' -# Absolute path to the directory static files should be collected to. -# Don't put anything in this directory yourself; store your static files -# in apps' "static/" subdirectories and in STATICFILES_DIRS. -# Example: "/var/www/example.com/static/" -STATIC_ROOT = '/home/osp/static-relearn-collected/' - # URL prefix for static files. # Example: "http://example.com/static/", "http://static.example.com/" STATIC_URL = '/static/' -- GitLab