Canonicalize on sipb.mit.edu

[sipb-www.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index 247b755afd43384e5845529a3fa062b5cb9a5974..866e817c21dafc6a5391f503ef4ba68ba907e98b 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -7,8 +7,9 @@
 RewriteEngine On
 RewriteBase /
 
-# Redirect /iap to stuff.mit.edu/iap
-RewriteRule ^iap(/.*)?$ http://stuff.mit.edu/iap$1 [R,L]
+# Canonicalize on sipb.mit.edu
+RewriteCond %{HTTP_HOST} !^sipb.mit.edu$ [NC]
+RewriteRule ^(.*)$ http://sipb.mit.edu$1 [R=301,L]
 
 # Serve some CGI scripts from _wiki-cgi
 RewriteRule ^ikiwiki.cgi$ _wiki-cgi/ikiwiki.cgi [L]
@@ -28,3 +29,6 @@ RewriteRule ^wiki(/.*)?$ $1 [R=permanent,L]
 
 # Redirect old /doc/wiki to sipb-www.scripts
 RewriteRule ^doc/wiki(/.*)?$ http://sipb-www.scripts.mit.edu/doc/wiki$1 [R,L]
+
+# Give a better error page for 404s
+ErrorDocument 404 /_wiki-cgi/ikiwiki.cgi