From 7be626ff2f873db575dd4928b22ad92fa4f86ba5 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 23 Oct 2012 15:36:27 -0400 Subject: [PATCH] Run trac on top of Apache rather than the standalone server. (imported from commit 2e9ee69a6f36b4c145d83abdf975bbe5d7ec1c7d) --- servers/puppet/files/apache/sites/trac | 26 ++++++++++++++++---------- servers/puppet/manifests/site.pp | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/servers/puppet/files/apache/sites/trac b/servers/puppet/files/apache/sites/trac index 1e2fdd3184..8648e81f76 100644 --- a/servers/puppet/files/apache/sites/trac +++ b/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 - - Order deny,allow - Allow from all + + Order allow,deny + Allow from all + + WSGIScriptAlias / /home/humbug/trac/cgi-bin/trac.wsgi + + + WSGIApplicationGroup %{GLOBAL} + Order deny,allow + Allow from all + + + AuthType Digest AuthName "wiki" AuthDigestProvider file AuthUserFile /etc/apache2/users/wiki Require valid-user - - - ProxyPassReverse / http://127.0.0.1:5002 - RewriteRule ^(.*) http://127.0.0.1:5002$1 [P] + ErrorLog /var/log/apache2/error.log LogLevel warn diff --git a/servers/puppet/manifests/site.pp b/servers/puppet/manifests/site.pp index 7e3031a81d..c843b8abfc 100644 --- a/servers/puppet/manifests/site.pp +++ b/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", ]: