Index: trunk/packages/sipb-xen-www/debian/changelog
===================================================================
--- trunk/packages/sipb-xen-www/debian/changelog	(revision 525)
+++ trunk/packages/sipb-xen-www/debian/changelog	(revision 526)
@@ -1,2 +1,8 @@
+sipb-xen-www (3.4) unstable; urgency=low
+
+  * xvm.mit.edu rather than sipb-xen-dev.mit.edu
+
+ -- Greg Price <price@mit.edu>  Sun, 11 May 2008 00:49:58 -0400
+
 sipb-xen-www (3.3) unstable; urgency=low
 
Index: trunk/packages/sipb-xen-www/files/etc/apache2/sites-available/default
===================================================================
--- trunk/packages/sipb-xen-www/files/etc/apache2/sites-available/default	(revision 525)
+++ trunk/packages/sipb-xen-www/files/etc/apache2/sites-available/default	(revision 526)
@@ -9,9 +9,4 @@
 		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>
 
@@ -20,5 +15,5 @@
         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]
@@ -31,5 +26,4 @@
 		Order allow,deny
 		Allow from all
-		#Redirect / https://sipb-xen-dev.mit.edu/
 	</Directory>
 
Index: trunk/packages/sipb-xen-www/files/etc/apache2/sites-available/ssl
===================================================================
--- trunk/packages/sipb-xen-www/files/etc/apache2/sites-available/ssl	(revision 525)
+++ trunk/packages/sipb-xen-www/files/etc/apache2/sites-available/ssl	(revision 526)
@@ -1,5 +1,5 @@
 <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
@@ -52,10 +52,10 @@
 
 
-	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
Index: trunk/packages/sipb-xen-www/files/etc/apache2/sites-available/svn
===================================================================
--- trunk/packages/sipb-xen-www/files/etc/apache2/sites-available/svn	(revision 525)
+++ trunk/packages/sipb-xen-www/files/etc/apache2/sites-available/svn	(revision 526)
@@ -1,5 +1,5 @@
 <VirtualHost *:1111>
-	ServerAdmin sipb-xen@mit.edu
-	ServerName sipb-xen-dev.mit.edu:1111
+	ServerAdmin xvm@mit.edu
+	ServerName xvm.mit.edu:1111
 	
 	<Directory />