X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f9f30ee618bf309a9d4e4565adb73dfedd1ef203..46e7ff2d21a6ffdafa29a4f02e68aef00c42f925:/.htaccess

diff --git a/.htaccess b/.htaccess
index b891dff..ce4b2ed 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,6 +1,6 @@
-Options        -MultiViews
+Options        -MultiViews -Indexes
 DirectoryIndex index.plp
-Action         plp-document    /PLP_COMMON/plp.cgi
+DirectorySlash Off
 
 RewriteEngine  on
 RewriteBase    /
@@ -10,18 +10,32 @@ 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]
+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
+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}.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
 
-# compress html output if accepted by client
-<IfModule deflate_module>
-AddOutputFilterByType DEFLATE text/html
+# allow browsers to cache for upto a month
+<IfModule headers_module>
+<FilesMatch "\.(?:css|js|json)$">
+Header set Cache-Control "max-age=2592000"
+Header set Access-Control-Allow-Origin "*"
+</FilesMatch>
 </IfModule>