Run trac on top of Apache rather than the standalone server.

(imported from commit 2e9ee69a6f36b4c145d83abdf975bbe5d7ec1c7d)

servers/puppet/files/apache/sites/trac

@@ -12,23 +12,29 @@
 
     Header add Strict-Transport-Security "max-age=15768000"
 
-    RewriteEngine On
-    ProxyPreserveHost On
-    ProxyRequests Off
+    Alias /chrome/common /home/humbug/trac/htdocs/common
+    Alias /chrome/site /home/humbug/trac/htdocs/site
 
-    <Proxy *>
-       Order deny,allow
-       Allow from all
+    <Directory "/home/humbug/trac/htdocs">
+      	Order allow,deny
+        Allow from all
+    </Directory>
 
+    WSGIScriptAlias / /home/humbug/trac/cgi-bin/trac.wsgi
+
+    <Directory /home/humbug/trac>
+    	WSGIApplicationGroup %{GLOBAL}
+    	Order deny,allow
+	Allow from all
+    </Directory>
+
+    <Location "/">
        AuthType Digest
        AuthName "wiki"
        AuthDigestProvider file
        AuthUserFile /etc/apache2/users/wiki
        Require valid-user
-    </Proxy>
-
-    ProxyPassReverse /    http://127.0.0.1:5002
-    RewriteRule ^(.*) http://127.0.0.1:5002$1 [P]
+    </Location>
 
     ErrorLog /var/log/apache2/error.log
     LogLevel warn

servers/puppet/manifests/site.pp

@@ -89,7 +89,7 @@ class humbug_base {
 }
 
 class humbug_web_base {
-  $web_packages = [ "apache2", "gitit", ]
+  $web_packages = [ "apache2", "gitit", "libapache2-mod-wsgi", ]
   package { $web_packages: ensure => "installed" }
 
   apache2mod { [ "headers", "proxy", "proxy_http", "rewrite", "auth_digest", ]: