summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2008-09-05 16:12:21 +1000
committerJeremy Kerr <jk@ozlabs.org>2008-09-05 16:12:21 +1000
commit3d3b4b3d8f694df76b7be490ca025302f8ba19ae (patch)
tree3b3d5c1599a652ec1eb7be95d456528181090a42
parent29e3847315b4b8c83e61aeb01ad30932463899e6 (diff)
downloadpatchwork-3d3b4b3d8f694df76b7be490ca025302f8ba19ae.tar.bz2
patchwork-3d3b4b3d8f694df76b7be490ca025302f8ba19ae.tar.xz
Use local settings module
This makes checkouts into a working patchwork site much easier. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-rw-r--r--apps/settings.py10
-rw-r--r--docs/INSTALL20
2 files changed, 24 insertions, 6 deletions
diff --git a/apps/settings.py b/apps/settings.py
index 719b9d1..d5fd7b1 100644
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -97,3 +97,13 @@ DEFAULT_PATCHES_PER_PAGE = 100
DEFAULT_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
ACCOUNT_ACTIVATION_DAYS = 7
+
+try:
+ from local_settings import *
+except ImportError, ex:
+ import sys
+ sys.stderr.write(\
+ ("settings.py: error importing local settings file:\n" + \
+ "\t%s\n" + \
+ "Do you have a local_settings.py module?\n") % str(ex))
+ raise
diff --git a/docs/INSTALL b/docs/INSTALL
index 0d5cc3e..1748601 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -62,15 +62,17 @@ in brackets):
cd ../../apps
ln -s ../lib/packages/django-registration ./registration
- You'll need to customise apps/settings.py to suit your database, and
- change the SECRET_KEY variable too. While you're there, change the
- following to suit your installation:
+ The settings.py file contains default settings for patchwork, you'll
+ need to configure settings for your own setup.
- SECRET_KEY
+ Rather than edit settings.py, create a file 'local_settings.py', and
+ override or add settings as necessary. You'll need to define the
+ following:
+
+ SECRET_KEY
ADMINS
TIME_ZONE
LANGUAGE_CODE
- MEDIA_ROOT
You can generate the SECRET_KEY with the following python code:
@@ -78,10 +80,16 @@ 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:
+
+ MEDIA_ROOT
+ TEMPLATE_DIRS
+
Then, get patchwork to create its tables in your configured database:
cd apps/
- ./manage.py syncdb
+ PYTHONPATH=../lib/python ./manage.py syncdb
And add privileges for your mail and web users: