launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/maas-add-path into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/maas-add-path/+merge/95947

This branch moves wsgi.py in contrib.  It also modifies wsgi.py to dynamically add the path were settings.py and urls.py will be found.  This is because http://wiki.debian.org/DjangoPackagingDraft says that the code of a django project should be in a private location and its path has to be added at runtime.  Also, I've fixed the apache configuration to reflect the change.
-- 
https://code.launchpad.net/~rvb/maas/maas-add-path/+merge/95947
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/maas-add-path into lp:maas.

=== modified file 'contrib/maas-http.conf'
--- contrib/maas-http.conf	2012-03-02 10:24:50 +0000
+++ contrib/maas-http.conf	2012-03-05 17:03:20 +0000
@@ -1,4 +1,4 @@
-WSGIScriptAlias /MaaS  /usr/share/pyshared/maas/wsgi.py
+WSGIScriptAlias /MaaS  /usr/share/maas/wsgi.py
 
 # Serve files from staticfiles.
 Alias /MaaS/static/ /var/lib/maas/static/

=== renamed file 'src/maas/wsgi.py' => 'contrib/wsgi.py'
--- src/maas/wsgi.py	2012-02-29 17:27:23 +0000
+++ contrib/wsgi.py	2012-03-05 17:03:20 +0000
@@ -12,9 +12,12 @@
 __all__ = []
 
 import os
+import sys
 
 import django.core.handlers.wsgi
 
 
+sys.path.append('/usr/share/maas/')
+
 os.environ['DJANGO_SETTINGS_MODULE'] = 'maas.settings'
 application = django.core.handlers.wsgi.WSGIHandler()