From 29ba32ffeb954224caae710fa083ccf78e99380a Mon Sep 17 00:00:00 2001
From: Mathijs <mathijs@lermer.nl>
Date: Sun, 15 Jan 2023 17:01:39 +0100
Subject: [PATCH] update

---
 .htaccess                    |  95 ++++++++++++++++++++++++++++-------
 404.html                     |   2 +-
 assets/afb/notlookingfor.gif | Bin
 3 files changed, 78 insertions(+), 19 deletions(-)
 mode change 100644 => 100755 .htaccess
 mode change 100644 => 100755 assets/afb/notlookingfor.gif

diff --git a/.htaccess b/.htaccess
old mode 100644
new mode 100755
index b3ad155..db9bea7
--- a/.htaccess
+++ b/.htaccess
@@ -3,21 +3,80 @@ SetEnv TZ Europe/Amsterdam
 Header set Strict-Transport-Security "max-age=31536000" env=HTTPS
 Options All -Indexes
 
-<IfModule mod_expires.c>  
-  # Turn on the module.
-  ExpiresActive on
-  # Set the default expiry times.
-  ExpiresDefault "access plus 2 days"
-  ExpiresByType image/jpg "access plus 1 month"
-  ExpiresByType image/svg+xml "access 1 month"
-  ExpiresByType image/gif "access plus 1 month"
-  ExpiresByType image/jpeg "access plus 1 month"
-  ExpiresByType image/png "access plus 1 month"
-  ExpiresByType text/css "access plus 1 month"
-  ExpiresByType text/javascript "access plus 1 month"
-  ExpiresByType application/javascript "access plus 1 month"
-  ExpiresByType application/x-shockwave-flash "access plus 1 month"
-  ExpiresByType image/ico "access plus 1 month"
-  ExpiresByType image/x-icon "access plus 1 month"
-  ExpiresByType text/html "access plus 600 seconds"
-</IfModule>  
\ No newline at end of file
+
+<IfModule mod_rewrite.c> 
+Options +FollowSymLinks -MultiViews
+
+RewriteEngine On 
+RewriteBase /
+
+#www to non
+RewriteCond %{HTTP_HOST} ^www\.(([a-z0-9_]+\.)?domain\.com)$ [NC]
+RewriteRule ^(.+?)/?$ http://%1/$1/ [R=301,L]
+
+RewriteCond %{THE_REQUEST} \s/+(.+?)\.html/?[\s?] [NC]
+RewriteRule ^ /%1/ [R=301,NE,L]
+
+#index redirect 
+RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /index\.html\ HTTP/ 
+RewriteRule ^index\.html$ http://%{HTTP_HOST}/ [R=301,L]
+
+# add a trailing slash to non files
+RewriteCond %{ENV:REDIRECT_STATUS} ^$
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*?[^/])$ %{REQUEST_URI}/ [L,R=301,NE]
+
+# add html internally
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d 
+RewriteRule ^([^.]+)/$ $1.html [L]
+
+</IfModule>
+
+<IfModule mod_expires.c>
+     ExpiresActive on
+     ExpiresDefault                                      "access plus 1 month"
+      # CSS
+     ExpiresByType text/css                              "access plus 1 year"
+  # Data interchange
+     ExpiresByType application/json                      "access plus 0 seconds"
+     ExpiresByType application/xml                       "access plus 0 seconds"
+     ExpiresByType text/xml                              "access plus 0 seconds"
+
+  # Favicon
+     ExpiresByType image/x-icon                          "access plus 1 week"
+
+  # HTML components
+     ExpiresByType text/x-component                      "access plus 1 month"
+
+  # HTML
+     ExpiresByType text/html                             "access plus 0 seconds"
+
+  # JavaScript
+     ExpiresByType application/javascript                "access plus 1 year"
+
+  # Manifest files
+     ExpiresByType application/x-web-app-manifest+json   "access plus 0 seconds"
+     ExpiresByType text/cache-manifest                   "access plus 0 seconds"
+
+  # Media
+     ExpiresByType audio/ogg                             "access plus 1 month"
+     ExpiresByType image/gif                             "access plus 1 month"
+     ExpiresByType image/jpeg                            "access plus 1 month"
+     ExpiresByType image/png                             "access plus 1 month"
+     ExpiresByType video/mp4                             "access plus 1 month"
+     ExpiresByType video/ogg                             "access plus 1 month"
+     ExpiresByType video/webm                            "access plus 1 month"
+
+  # Web feeds
+     ExpiresByType application/atom+xml                  "access plus 1 hour"
+     ExpiresByType application/rss+xml                   "access plus 1 hour"
+
+  # Web fonts
+     ExpiresByType application/font-woff2                "access plus 1 month"
+     ExpiresByType application/font-woff                 "access plus 1 month"
+     ExpiresByType application/vnd.ms-fontobject         "access plus 1 month"
+     ExpiresByType application/x-font-ttf                "access plus 1 month"
+     ExpiresByType font/opentype                         "access plus 1 month"
+     ExpiresByType image/svg+xml                         "access plus 1 month"
+</IfModule>
\ No newline at end of file
diff --git a/404.html b/404.html
index a6baec9..439cbf1 100755
--- a/404.html
+++ b/404.html
@@ -61,7 +61,7 @@
             </picture>
             <br><br>
             <div id="knop">
-              <a href="https://lermer.nl" class="knop knop_contact">MOVE ALONG</a><br>
+              <a href="/index.html" class="knop knop_contact">MOVE ALONG</a><br>
             </div>
           </div>
 
diff --git a/assets/afb/notlookingfor.gif b/assets/afb/notlookingfor.gif
old mode 100644
new mode 100755