X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/d263f9d2c3b9004efd0df2bcc162816b3f155f0d..bf3cdd78584bc5b585a6282185f2b4e61d3be5f5:/files/etc/apache2/sites-available/ssl.mako

diff --git a/files/etc/apache2/sites-available/ssl.mako b/files/etc/apache2/sites-available/ssl.mako
index b722bfd..be558e0 100644
--- a/files/etc/apache2/sites-available/ssl.mako
+++ b/files/etc/apache2/sites-available/ssl.mako
@@ -24,13 +24,8 @@ ${caller.body()}
 	RewriteRule ^/static(.*) - [L]
 	RewriteRule ^/overlord/static(.*) /static/$1 [L]
 	RewriteRule ^/admin/static(.*) /static/$1 [L]
-	RewriteRule ^/trac.fcgi(.*) - [L]
-	RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L]
-	RewriteRule ^/trac(.*) /var/www/trac/trac.fcgi$1 [L]
-	RewriteRule ^/var(.*) - [L]
-	RewriteRule ^/wiki(.*) - [L]
+	RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]
 	RewriteRule ^/kill.cgi - [L]
-	RewriteRule ^/~ - [L]
 	RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/$1 [L]
 
 	RewriteLog /var/log/apache2/rewrite.log
@@ -50,7 +45,7 @@ ${caller.body()}
 	SSLCertificateFile ssl/server.crt
 	SSLCertificateKeyFile ssl/server.key
 	
-	SSLCACertificateFile ssl/mitCAclient.pem
+	SSLCACertificateFile /etc/ssl/certs/mitCAclient.pem
 	SSLVerifyDepth 10
 
 	SSLOptions +StdEnvVars
@@ -79,7 +74,7 @@ ${caller.body()}
 		KrbMethodNegotiate on
 		KrbMethodK5Passwd off
 		KrbAuthoritative off
-		KrbAuthRealms ${cfg.authn[0].realm}
+		KrbAuthRealms ${cfg.kerberos.realm}
 		Krb5Keytab /etc/invirt/keytab
 		KrbSaveCredentials off
 	</%call>