X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=docs%2FINSTALL;h=cb0eccfc85a64dabe7cf82a1479156f72328d4aa;hb=daa3ae42eee5e569881070bcc2958b361743f70a;hp=b006178c5e4d63bb9aff9ed85f174bf6b9b32a74;hpb=ad2762cf775a8dde508de47164d6429f3fd724f1;p=patchwork

diff --git a/docs/INSTALL b/docs/INSTALL
index b006178..cb0eccf 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -108,15 +108,22 @@ in brackets):
       cd ../python
       ln -s ../packages/django/django ./django
 
-    The settings.py file contains default settings for patchwork, you'll
-    need to configure settings for your own setup.
+    The patchwork/settings/*.py files contain default settings for patchwork,
+    you'll need to configure settings for your own setup.
 
-    Rather than edit settings.py, create a file 'local_settings.py', and
-    override or add settings as necessary. You'll need to define the
+    Rather than editing these files (which will cause conflicts when you
+    update the base patchwork code), create a file 'production.py', based on
+    the example:
+
+       cp patchwork/settings/production.example.py \
+          patchwork/settings/production.py
+
+    and override or add settings as necessary. You'll need to define the
     following:
 
       SECRET_KEY
       ADMINS
+      DATABASES
       TIME_ZONE
       LANGUAGE_CODE
       DEFAULT_FROM_EMAIL
@@ -137,7 +144,11 @@ in brackets):
 
      PYTHONPATH=lib/python ./manage.py syncdb
 
-    And add privileges for your mail and web users. This is only needed if
+    and initialise the static content:
+
+     PYTHONPATH=lib/python ./manage.py collectstatic
+
+    and add privileges for your mail and web users. This is only needed if
     you use the ident-based approach. If you use password-based database
     authentication, you can skip this step.
 
@@ -240,7 +251,7 @@ in brackets):
 
       # m h  dom mon dow   command
       PYTHONPATH=.
-      DJANGO_SETTINGS_MODULE=settings
+      DJANGO_SETTINGS_MODULE=patchwork.settings.production
       */10 * * * * cd patchwork; python patchwork/bin/patchwork-cron.py