X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/5d194c948d57f1a6f0ff48b39117aa6070a65bf3..8ec1a464ae2fc3fefb89866be6eb2b0142ecbf3d:/files/etc/apache2/sites-available/default?ds=sidebyside

diff --git a/files/etc/apache2/sites-available/default b/files/etc/apache2/sites-available/default
index dc99744..847208b 100644
--- a/files/etc/apache2/sites-available/default
+++ b/files/etc/apache2/sites-available/default
@@ -2,27 +2,23 @@ NameVirtualHost *:80
 <VirtualHost *:80>
 	ServerAdmin webmaster@localhost
 	
-	DocumentRoot /var/www/
-	<Directory /var/www/>
+	DocumentRoot /var/www/sipb-xen-www
+	<Directory /var/www/sipb-xen-www>
 		Options Indexes FollowSymLinks MultiViews ExecCGI
 		AllowOverride None
 		Order allow,deny
 		allow from all
-		# This directive allows us to have apache2's default start page
-                # in /apache2-default/, but still have / go to the right place
-                #RedirectMatch ^/$ /apache2-default/
-		#Redirect / https://sipb-xen-dev.mit.edu/
-		#RedirectMatch ^/(!?trac) https://sipb-xen-dev.mit.edu/
 	</Directory>
 
 	RewriteEngine On
-	#RewriteRule ^/trac - [L]
+	RewriteRule ^/static(.*) - [L]
         RewriteRule ^/trac.fcgi(.*) - [L]
         RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L]
-	RewriteRule ^/trac/login(.*) https://sipb-xen-dev.mit.edu/trac/login$1 [L]
+	RewriteRule ^/trac/login(.*) https://xvm.mit.edu/trac/login$1 [L]
         RewriteRule ^/trac(.*) /var/www/trac/trac.fcgi$1 [L]
 	RewriteRule ^/sipb-xen - [L]
-	RewriteRule ^(.*) https://sipb-xen-dev.mit.edu$1
+	RewriteRule ^/kill.cgi - [L]
+	RewriteRule ^/(.*) /var/www/sipb-xen-www/main.fcgi/$1 [L]
 
 	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 	<Directory "/usr/lib/cgi-bin">
@@ -30,7 +26,6 @@ NameVirtualHost *:80
 		Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
 		Order allow,deny
 		Allow from all
-		#Redirect / https://sipb-xen-dev.mit.edu/
 	</Directory>
 
 	ErrorLog /var/log/apache2/error.log