X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d93f65ecf4924bc5351568ba2fc70b87e45143f7..dc1ab5f00eed170e75fe40687b381369a35760b8:/.htaccess

diff --git a/.htaccess b/.htaccess
index 35296ee..61d5f36 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,26 +5,33 @@ 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
-RewriteRule ^vim$                    /vi [R=301]
-RewriteRule ^cc$                     /countries [R=301]
+RewriteRule ^vim$                    /vi                      [R=301]
+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
-RewriteRule    ^(digraphs)\.ex(/.*)?$ $1.vim$2
+RewriteRule ^(digraphs)\.ex(/.*)?$   $1.vim$2
 
 # add .plp if a file exists with .plp appended (topdir only)
-RewriteCond    %{REQUEST_FILENAME}     !-f
-RewriteCond    %{DOCUMENT_ROOT}/$1.plp  -f
-RewriteRule    ^/*([^/]+)(.*)           $1.plp$2
+RewriteCond %{REQUEST_FILENAME}     !-f
+RewriteCond %{DOCUMENT_ROOT}/$1.plp  -f
+RewriteRule ^/*([^/]+)(.*)           $1.plp$2
 
 # replace jpeg images by webp alternatives if supported
-RewriteCond    %{HTTP_ACCEPT}           \bimage/webp
-RewriteCond    %{DOCUMENT_ROOT}/$1.webp -f
-RewriteRule    (.*)\.jpg$               $1.webp
+RewriteCond %{HTTP_ACCEPT}           \bimage/webp
+RewriteCond %{DOCUMENT_ROOT}/$1.webp -f
+RewriteRule (.*)\.jpg$               $1.webp
 
 # allow browsers to cache for upto a month
 <IfModule headers_module>