htaccess: upgrade only sheet.shiar.nl, redirect .net tld

[sheet.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index ce4b2ed51e50460288fd3677e04f8e5f12c0e7df..61d5f361294680c77f63a66552a6f35cee1c4d2e 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -5,8 +5,9 @@ DirectorySlash Off
 RewriteEngine  on
 RewriteBase    /
 
-# redirect from old vim-only subdomain
-RewriteCond %{HTTP_HOST}             ^vim?\.shiar\.\w+$
+# redirect from deprecated domain names
+RewriteCond %{HTTP_HOST}             ^vim?\.shiar\.\w+$       [OR]
+RewriteCond %{HTTP_HOST}             =sheet.shiar.net
 RewriteRule ^(vi(?=m$)|.*)           http://sheet.shiar.nl/$1 [R=301]
 
 # redirect old locations
@@ -16,6 +17,7 @@ RewriteRule ^cc$                     /countries               [R=301]
 # forward to https protocol if requested
 RewriteCond %{HTTPS}                          =off
 RewriteCond %{HTTP:Upgrade-Insecure-Requests} =1
+RewriteCond %{HTTP_HOST}                      =sheet.shiar.nl
 RewriteRule (.*)                     https://%{HTTP_HOST}/$1  [L]
 
 # serve vim commands when requesting /digraphs.ex as well