Index: trunk/packages/invirt-web/debian/changelog
===================================================================
--- trunk/packages/invirt-web/debian/changelog	(revision 1668)
+++ trunk/packages/invirt-web/debian/changelog	(revision 1669)
@@ -1,2 +1,8 @@
+invirt-web (0.0.9) unstable; urgency=low
+
+  * Move trac off-site - redirect somewhere else
+
+ -- Evan Broder <broder@mit.edu>  Sat, 15 Nov 2008 23:12:57 -0500
+
 invirt-web (0.0.8) unstable; urgency=low
 
Index: trunk/packages/invirt-web/files/etc/apache2/sites-available/default
===================================================================
--- trunk/packages/invirt-web/files/etc/apache2/sites-available/default	(revision 1668)
+++ trunk/packages/invirt-web/files/etc/apache2/sites-available/default	(revision 1669)
@@ -1,5 +1,12 @@
+<%
+from invirt.config import structs as cfg
+hostname = cfg.web.hostname
+errmail  = cfg.web.errormail
+tracuri  = cfg.trac.uri
+%>
 NameVirtualHost *:80
 <VirtualHost *:80>
-	ServerAdmin webmaster@localhost
+	ServerAdmin ${errmail}
+        ServerName ${hostname}:80
 	
 	DocumentRoot /var/www/invirt-web
@@ -14,8 +21,5 @@
 	RewriteRule ^/static(.*) - [L]
 	RewriteRule ^/admin/static(.*) /static/$1 [L]
-        RewriteRule ^/trac.fcgi(.*) - [L]
-        RewriteRule ^/trac/chrome/common(.*) /usr/share/trac/htdocs$1 [L]
-	RewriteRule ^/trac/login(.*) https://xvm.mit.edu/trac/login$1 [L]
-        RewriteRule ^/trac(.*) /var/www/trac/trac.fcgi$1 [L]
+	RewriteRule ^/trac(.*) ${trac.uri}$1 [R,L]
 	RewriteRule ^/invirt - [L]
 	RewriteRule ^/sipb-xen(.*) /invirt$1 [PT]
@@ -23,12 +27,4 @@
 	RewriteRule ^/~ - [L]
 	RewriteRule ^/(.*) /var/www/invirt-web/main.fcgi/$1 [L]
-
-	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-	<Directory "/usr/lib/cgi-bin">
-		AllowOverride None
-		Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		Order allow,deny
-		Allow from all
-	</Directory>
 
 	ErrorLog /var/log/apache2/error.log
Index: trunk/packages/invirt-web/files/etc/apache2/sites-available/ssl.mako
===================================================================
--- trunk/packages/invirt-web/files/etc/apache2/sites-available/ssl.mako	(revision 1668)
+++ trunk/packages/invirt-web/files/etc/apache2/sites-available/ssl.mako	(revision 1669)
@@ -25,9 +25,5 @@
 	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(.*) ${trac.uri}$1 [R,L]
 	RewriteRule ^/kill.cgi - [L]
 	RewriteRule ^/~ - [L]