mod_python example configuration fixes

These fixes correct the example patchwork.mod_python.conf file to
actually work properly:

* Patchwork base directory needs to be in PythonPath so that
  things like "apps.urls" will import

* Set DJANGO_SETTINGS_MODULE to "settings" instead of
  "patchwork.settings" so that it can find the settings file to
  import

* Use LocationMatch instead of Location in order for the pattern
  matching to work (this was causing none of the images/stylesheets
  to be found when using mod_python)

Signed-off-by: Nate Case <ncase@xes-inc.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/lib/apache2/patchwork.mod_python.conf b/lib/apache2/patchwork.mod_python.conf
index a84a9e2ba7449d92f4eb302faddf41a3c6678ecc..6dbb09b931beeecd80fcf081f24f1e981075e11c 100644 (file)
--- a/lib/apache2/patchwork.mod_python.conf
+++ b/lib/apache2/patchwork.mod_python.conf
@@ -7,13 +7,13 @@ NameVirtualHost patchwork.example.com:80
        <Location "/">
            SetHandler python-program
            PythonHandler django.core.handlers.modpython
-           PythonPath "['/srv/patchwork/apps', '/srv/patchwork/lib/python'] + sys.path"
-           SetEnv DJANGO_SETTINGS_MODULE patchwork.settings
+           PythonPath "['/srv/patchwork/apps', '/srv/patchwork', '/srv/patchwork/lib/python'] + sys.path"
+           SetEnv DJANGO_SETTINGS_MODULE settings
        </Location>
 
-       <Location "/(images|css|js|media)/">
+       <LocationMatch "^/+(images|css|js|media)/">
            SetHandler None
-       </Location>
+       </LocationMatch>
 
        LogLevel warn
        ErrorLog /var/log/apache2/patchwork-error.log