index: release v1.18 with only altgr index linked

[sheet.git] / .htaccess

diff --git a/.htaccess b/.htaccess
index ce4b2ed51e50460288fd3677e04f8e5f12c0e7df..90f32b4dea33dea798eae4db36313137dd1e1ecd 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,12 +1,14 @@
 Options        -MultiViews -Indexes
 DirectoryIndex index.plp
 DirectorySlash Off
+AddCharset     utf-8 .txt
 
 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 +18,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
@@ -31,9 +34,12 @@ RewriteCond %{HTTP_ACCEPT}           \bimage/webp
 RewriteCond %{DOCUMENT_ROOT}/$1.webp -f
 RewriteRule (.*)\.jpg$               $1.webp
 
-# allow browsers to cache for upto a month
+# allow browsers to cache static assets for upto a month
 <IfModule headers_module>
-<FilesMatch "\.(?:css|js|json)$">
+<FilesMatch "\.(?:css|gif|png|jpg|webp|jxl|svg)$">
+Header set Cache-Control "max-age=2592000"
+</FilesMatch>
+<FilesMatch "\.(?:js|json)$">
 Header set Cache-Control "max-age=2592000"
 Header set Access-Control-Allow-Origin "*"
 </FilesMatch>