[PATCH 2/4] settings.py: use python to find ROOT_DIR
Andreas Bießmann
andreas at biessmann.de
Wed Nov 20 01:44:00 EST 2013
Signed-off-by: Andreas Bießmann <andreas at biessmann.de>
---
apps/settings.py | 4 +---
docs/INSTALL | 7 -------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/apps/settings.py b/apps/settings.py
index 43a37d8..4e09a29 100644
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -68,9 +68,7 @@ ROOT_URLCONF = 'apps.urls'
LOGIN_URL = '/user/login/'
LOGIN_REDIRECT_URL = '/user/'
-# If you change the ROOT_DIR setting in your local_settings.py, you'll need to
-# re-define the variables that use this (MEDIA_ROOT and TEMPLATE_DIRS) too.
-ROOT_DIR = '/srv/patchwork'
+ROOT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir)
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
diff --git a/docs/INSTALL b/docs/INSTALL
index e5f88e8..b7924d8 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -113,13 +113,6 @@ in brackets):
chars = string.letters + string.digits + string.punctuation
print repr("".join([random.choice(chars) for i in range(0,50)]))
- If you have patchwork installed in somewhere other than /srv/patchwork,
- you'll also need to define:
-
- ROOT_DIR
- MEDIA_ROOT
- TEMPLATE_DIRS
-
If you wish to enable the XML-RPC interface, add the following to
your local_settings.py file:
--
1.7.10.4
More information about the Patchwork
mailing list