[Maposmatic-dev] [PATCH maposmatic] Updated INSTALL and templates

[David Decotigny]

From: David Decotigny <address@hidden>

Added a few instructions in INSTALL to test. Also added instructions
in the config templates to help customize the python search path.
---
 INSTALL                        |   25 +++++++++++++++++++------
 scripts/config.py-template     |    6 ++++++
 www/settings_local.py-template |   11 ++++++++++-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/INSTALL b/INSTALL
index ac6185b..bb8684a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -65,18 +65,31 @@ You'll find in support/init-maposmaticd-template an init 
script template that
 you can tweak and install on your machine to start the MapOSMatic rendering
 daemon automatically at boot time.
 
-Web server configuration
-------------------------
+Testing with Django integrated web server
+-----------------------------------------
 
-For Apache, you can adapt the configuration file given in
-support/apache-maposmatic-template.
+Before you think about configuring your web server to provide the
+maposmatic services, you should try them locally first:
+
+  .../www/manage.py runserver
+
+Then point your web browser to the address mentioned in the output
+message.
+
+External Web server configuration
+---------------------------------
+
+In a normal setup, you don't want to use the Django integrated web
+server. If you are using Apache, you can adapt the configuration file
+given in support/apache-maposmatic-template.
 
 Internationalization
 --------------------
 
-To get proper internationalisation, you need to compile the gettext locale 
files:
+To get proper internationalisation, you need to compile the gettext
+locale files:
 
-  django-admin compilemessages
+  cd www && django-admin compilemessages
 
 Don't forget to restart the Django server or it won't pick up the new
 translated strings!
diff --git a/scripts/config.py-template b/scripts/config.py-template
index 3606098..23a51f9 100755
--- a/scripts/config.py-template
+++ b/scripts/config.py-template
@@ -19,3 +19,9 @@ MAPOSMATIC_LOG = '/tmp/maposmaticd.log'
 #  0: not set (discouraged)
 MAPOSMATIC_LVL = 20
 
+###
+## Optional: if you need to extend the python search path, then write
+## something like the following:
+# import os
+# os.environ['PYTHONPATH'] = '%s:%s' % ('/path/to/lib/python/site-packages',
+#                                      os.environ.get('PYTHONPATH', ''))
diff --git a/www/settings_local.py-template b/www/settings_local.py-template
index 9d9705a..5b8bbe6 100644
--- a/www/settings_local.py-template
+++ b/www/settings_local.py-template
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # coding: utf-8
 
 # maposmatic, the web front-end of the MapOSMatic city map generation system
@@ -67,5 +68,13 @@ BBOX_MAXIMUM_LENGTH_IN_METERS = 20000
 ITEMS_PER_PAGE = 25
 
 # PID file location for the rendering daemon associated with this
-# instance
+# instance; normally managed by the /etc/init.d scripts such as
+# start-stop-daemon(8) in debian systems:
 MAPOSMATIC_PID_FILE = '/var/run/maposmaticd.pid'
+
+###
+## Optional: if you need to extend the python search path, then write
+## something like the following:
+# import sys
+# sys.path.append('/path/to/ocitysmap')
+# sys.path.append('/path/to/lib/python/site-packages')
-- 
1.7.0.4