X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/5d194c948d57f1a6f0ff48b39117aa6070a65bf3..4d235e8d481971c081b3141babd65d36e9ad0337:/files/etc/apache2/sites-available/ssl

diff --git a/files/etc/apache2/sites-available/ssl b/files/etc/apache2/sites-available/ssl
index da1f9bc..848643c 100644
--- a/files/etc/apache2/sites-available/ssl
+++ b/files/etc/apache2/sites-available/ssl
@@ -1,6 +1,6 @@
 <VirtualHost *:443>
-	ServerAdmin sipb-xen@mit.edu
-	ServerName sipb-xen-dev.mit.edu:443
+	ServerAdmin xvm@mit.edu
+	ServerName xvm.mit.edu:443
 	
 	DocumentRoot /var/www/sipb-xen-www
 	<Directory /var/www/sipb-xen-www>
@@ -17,13 +17,18 @@
 	</Location>
 
 	RewriteEngine On
+	RewriteRule ^/favicon.ico - [L]
 	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 ^/(.*) /var/www/sipb-xen-www/main.py/$1 [L]
+	RewriteRule ^/kill.cgi - [L]
+	RewriteRule ^/~ - [L]
+	RewriteRule ^/(.*) /var/www/sipb-xen-www/main.fcgi/$1 [L]
 
 	RewriteLog /var/log/apache2/rewrite.log
 	RewriteLogLevel 0 
@@ -43,7 +48,7 @@
 	SSLCertificateKeyFile ssl/server.key
 	
 	SSLCACertificateFile ssl/mitCAclient.pem
-	SSLVerifyClient optional
+	SSLVerifyClient require
 	SSLVerifyDepth 10
 
 	SSLOptions +StdEnvVars
@@ -51,12 +56,12 @@
 	SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
 
 
-	Redirect /wiki https://sipb-xen-dev.mit.edu/trac/wiki	
+	Redirect /wiki https://xvm.mit.edu/trac/wiki	
 </VirtualHost>
 
 <VirtualHost *:446>
-	ServerAdmin sipb-xen@mit.edu
-	ServerName sipb-xen-dev.mit.edu:446
+	ServerAdmin xvm@mit.edu
+	ServerName xvm.mit.edu:446
 	
 	DocumentRoot /var/www/sipb-xen-www
 	<Directory />