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

[invirt/packages/invirt-web.git] / files / etc / apache2 / sites-available / default

diff --git a/files/etc/apache2/sites-available/default b/files/etc/apache2/sites-available/default
index 7f01f05..8a20897 100644 (file)
--- 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