← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~matsubara/python-oops-tools/fix-wsgi-script-for-charm into lp:python-oops-tools

 

Diogo Matsubara has proposed merging lp:~matsubara/python-oops-tools/fix-wsgi-script-for-charm into lp:python-oops-tools.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~matsubara/python-oops-tools/fix-wsgi-script-for-charm/+merge/90856

This branch changes the apache virtual host file to make it easier to deploy oops-tools using juju. See bug 918803 for details about the oops-tools juju charm.
-- 
https://code.launchpad.net/~matsubara/python-oops-tools/fix-wsgi-script-for-charm/+merge/90856
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~matsubara/python-oops-tools/fix-wsgi-script-for-charm into lp:python-oops-tools.
=== modified file 'buildout-templates/apache/oops-tools.dev.mod_wsgi.in'
--- buildout-templates/apache/oops-tools.dev.mod_wsgi.in	2011-10-13 20:18:51 +0000
+++ buildout-templates/apache/oops-tools.dev.mod_wsgi.in	2012-01-31 12:01:26 +0000
@@ -1,16 +1,6 @@
-# URL handling
-# http://oops-tools.dev/ -- root OOPS search page
-# http://oops-tools.dev/static/ -- static content (i.e. css)
-# http://oops-tools.dev/OOPS-12A34 -- display OOPS (doesn't work yet)
-# http://oops-tools.dev/?oopsid=OOPS-12A34 -- display OOPS
-# http://oops-tools.dev/oops.py/?oopsid=OOPS-12A34 -- display OOPS
-# http://oops-tools.dev/summary/  ???
-# 
-NameVirtualHost 127.0.0.55:80
-
-<VirtualHost 127.0.0.55:80>
-    ServerName oops-tools.dev
-
+UseCanonicalName Off
+
+<VirtualHost _default_:80>
     WSGIDaemonProcess oopstools user=www-data group=www-data threads=25
     WSGIProcessGroup oopstools