launchpad-reviewers team mailing list archive

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

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/maas-local-settings/+merge/95207

This branch:
- adds the wsgi.py file required to deploy the application with apache/mod_wsgi
- add support for local_settings.  It's required in production (that is for settings.py) but I thought it might be useful in development as well so I add the same trick to development.py.

Drive-by fix: I've removed django-nose from the production settings, this is used only in dev.
-- 
https://code.launchpad.net/~rvb/maas/maas-local-settings/+merge/95207
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/maas-local-settings into lp:maas.

=== modified file 'src/maas/development.py'
--- src/maas/development.py	2012-02-22 14:04:11 +0000
+++ src/maas/development.py	2012-02-29 16:44:26 +0000
@@ -205,3 +205,8 @@
 DEBUG_TOOLBAR_CONFIG = {
     'INTERCEPT_REDIRECTS': False,
     }
+
+try:
+    from local_settings import * # NOQA
+except:
+    pass

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2012-02-27 12:25:34 +0000
+++ src/maas/settings.py	2012-02-29 16:44:26 +0000
@@ -19,8 +19,6 @@
 
 django.template.add_to_builtins('django.templatetags.future')
 
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-
 ADMINS = (
     # ('Your Name', 'your_email@xxxxxxxxxxx'),
 )
@@ -180,7 +178,6 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django.contrib.admin',
-    'django_nose',
     'maasserver',
     'metadataserver',
     'piston',
@@ -214,3 +211,8 @@
 # The location of the Provisioning API XML-RPC endpoint. If PSERV_URL is None,
 # use the fake Provisioning API.
 PSERV_URL = None
+
+try:
+    from local_settings import * # NOQA
+except:
+    pass

=== added file 'src/maas/wsgi.py'
--- src/maas/wsgi.py	1970-01-01 00:00:00 +0000
+++ src/maas/wsgi.py	2012-02-29 16:44:26 +0000
@@ -0,0 +1,7 @@
+import os
+
+import django.core.handlers.wsgi
+
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'maas.settings'
+application = django.core.handlers.wsgi.WSGIHandler()