python-oops-tools

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

  1. fix-wsgi-script-for-charm
  2. Merge into trunk
Proposed by Diogo Matsubara
Status: Merged
Approved by: Robert Collins
Approved revision: 30
Merged at revision: 30
Proposed branch: lp:~matsubara/python-oops-tools/fix-wsgi-script-for-charm
Merge into: lp:python-oops-tools
Diff against target: 22 lines (+3/-13)
1 file modified
buildout-templates/apache/oops-tools.dev.mod_wsgi.in (+3/-13)
To merge this branch: bzr merge lp:~matsubara/python-oops-tools/fix-wsgi-script-for-charm
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+90856@code.launchpad.net

Commit message

Simpler vhost template, better for juju.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

Cool.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout-templates/apache/oops-tools.dev.mod_wsgi.in'
2--- buildout-templates/apache/oops-tools.dev.mod_wsgi.in 2011-10-13 20:18:51 +0000
3+++ buildout-templates/apache/oops-tools.dev.mod_wsgi.in 2012-01-31 12:01:26 +0000
4@@ -1,16 +1,6 @@
5-# URL handling
6-# http://oops-tools.dev/ -- root OOPS search page
7-# http://oops-tools.dev/static/ -- static content (i.e. css)
8-# http://oops-tools.dev/OOPS-12A34 -- display OOPS (doesn't work yet)
9-# http://oops-tools.dev/?oopsid=OOPS-12A34 -- display OOPS
10-# http://oops-tools.dev/oops.py/?oopsid=OOPS-12A34 -- display OOPS
11-# http://oops-tools.dev/summary/ ???
12-#
13-NameVirtualHost 127.0.0.55:80
14-
15-<VirtualHost 127.0.0.55:80>
16- ServerName oops-tools.dev
17-
18+UseCanonicalName Off
19+
20+<VirtualHost _default_:80>
21 WSGIDaemonProcess oopstools user=www-data group=www-data threads=25
22 WSGIProcessGroup oopstools
23

Subscribers

People subscribed via source and target branches

to all changes: