X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/cfc947fcaa22881a028623bba1acc32297718609..10012db3d6895a5b99d6b502005f7cee83a9cacd:/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 6f46666..526f52f 100644
--- a/files/etc/apache2/sites-available/ssl.mako
+++ b/files/etc/apache2/sites-available/ssl.mako
@@ -24,10 +24,8 @@ ${caller.body()}
 	RewriteRule ^/static(.*) - [L]
 	RewriteRule ^/overlord/static(.*) /static/$1 [L]
 	RewriteRule ^/admin/static(.*) /static/$1 [L]
-	RewriteRule ^/trac(.*) ${trac.uri}$1 [R,L]
-	RewriteRule ^/kill.cgi - [L]
-	RewriteRule ^/~ - [L]
-	RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/$1 [L]
+	RewriteRule ^/trac(.*) ${tracuri}$1 [R,L]
+	RewriteRule ^/(.*) /var/www/invirt-web/auth.fcgi/$1 [L]
 
 	RewriteLog /var/log/apache2/rewrite.log
 	RewriteLogLevel 0 
@@ -46,7 +44,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
@@ -75,7 +73,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>