htaccess: fix .plp redirect for multiviews-enabled apache

[sheet.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index 3e99fe8a944b1f75be19969adb054871a0d0a922..4b642c11df7d78251def7c45ada4a74f0c1a1294 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,10 +1,16 @@
+Options        -MultiViews
 DirectoryIndex index.plp
 
 RewriteEngine  on
 RewriteBase    /
 
-# redirect old location
+# redirect from old vim-only subdomain
+RewriteCond %{HTTP_HOST}             ^vim?\.shiar\.\w+$
+RewriteRule ^(vi(?=m$)|.*)           http://sheet.shiar.nl/$1 [R=301]
+
+# redirect old locations
 RewriteRule ^vim$                    /vi [R=301]
+RewriteRule ^cc$                     /countries [R=301]
 
 # serve vim commands when requesting /digraphs.ex as well
 RewriteRule    ^(digraphs)\.ex(/.*)?$ $1.vim$2