From: Greg Price <price@mit.edu>
Date: Sun, 11 May 2008 06:45:04 +0000 (-0400)
Subject: make web hostname canonicalize as xvm, not sipb-xen-dev
X-Git-Tag: sipb-xen-www/3.4~9
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/0e16120a7b3ae7887089cd1f8fc8d1e9925ebe52

make web hostname canonicalize as xvm, not sipb-xen-dev

svn path=/trunk/packages/sipb-xen-www/; revision=526
---

diff --git a/debian/changelog b/debian/changelog
index 633702b..e9c2ce6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
 
   * Fix the SVN server to point to the new AFS mountpoint
diff --git a/files/etc/apache2/sites-available/default b/files/etc/apache2/sites-available/default
index 7f01f05..8a20897 100644
--- a/files/etc/apache2/sites-available/default
+++ b/files/etc/apache2/sites-available/default
@@ -8,18 +8,13 @@ NameVirtualHost *:80
 		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 ^/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 ^/(.*) /var/www/sipb-xen-www/main.py/$1 [L]
@@ -30,7 +25,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
diff --git a/files/etc/apache2/sites-available/ssl b/files/etc/apache2/sites-available/ssl
index da1f9bc..b987447 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>
@@ -51,12 +51,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 />
diff --git a/files/etc/apache2/sites-available/svn b/files/etc/apache2/sites-available/svn
index 7c14296..5fc1d25 100644
--- a/files/etc/apache2/sites-available/svn
+++ b/files/etc/apache2/sites-available/svn
@@ -1,6 +1,6 @@
 <VirtualHost *:1111>
-	ServerAdmin sipb-xen@mit.edu
-	ServerName sipb-xen-dev.mit.edu:1111
+	ServerAdmin xvm@mit.edu
+	ServerName xvm.mit.edu:1111
 	
 	<Directory />
 		Options FollowSymLinks