X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/862be5161d8f6b22ce2b62c9b6d030944a442fca..e277c0f673ccb26f9b75c36ef03ac3c5d0dacaf8:/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 dfd5af9..526f52f 100644
--- a/files/etc/apache2/sites-available/ssl.mako
+++ b/files/etc/apache2/sites-available/ssl.mako
@@ -8,8 +8,8 @@ Listen 442
 Listen 446
 
 <%def name="invirt_webinterface()">
-	DocumentRoot /var/www/sipb-xen-www
-	<Directory /var/www/sipb-xen-www>
+	DocumentRoot /var/www/invirt-web
+	<Directory /var/www/invirt-web>
 		Options Indexes FollowSymLinks MultiViews ExecCGI
 		AllowOverride None
 		Order allow,deny
@@ -24,14 +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 ^/kill.cgi - [L]
-	RewriteRule ^/~ - [L]
-	RewriteRule ^/(.*) /var/www/sipb-xen-www/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 
@@ -50,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
@@ -79,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>
@@ -90,7 +84,7 @@ ${caller.body()}
 	ServerAdmin ${errmail}
 	ServerName ${hostname}:446
 	
-	DocumentRoot /var/www/sipb-xen-www
+	DocumentRoot /var/www/invirt-web
 	<Directory />
 		Options Indexes FollowSymLinks MultiViews ExecCGI
 		AllowOverride None