From d5f3c1c3bb4db8aaada80d3919eda0c4c0485951 Mon Sep 17 00:00:00 2001
From: "max.mehl" <max.mehl@fsfe.org>
Date: Sun, 27 Oct 2019 19:36:50 +0100
Subject: [PATCH] rewrite wrong (sub)domains, unify indentation

---
 static/.htaccess | 48 ++++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/static/.htaccess b/static/.htaccess
index 04a2d65..b862e57 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -1,6 +1,14 @@
 RewriteEngine On
 RewriteBase /
 
+# Redirect www, other domains, non-HTTPS
+RewriteCond %{HTTP_HOST} ^www\.mehl\.mx$ [NC]
+RewriteRule ^(.*)$ https://mehl.mx/$1 [R=301,L]
+RewriteCond %{HTTP_HOST} !^mehl\.mx$ [NC]
+RewriteRule ^(.*)$ https://mehl.mx/ [R=301,L]
+RewriteCond %{HTTPS} !on
+RewriteRule ^(.*)$ https://mehl.mx/$1 [R=301,L]
+
 # Redirect old links
 RewriteRule ^(en|de)/(.*)$ /$2 [R=301,L]
 RewriteRule ^(en|de)/?$ / [R=301,L]
@@ -23,24 +31,24 @@ AddOutputFilterByType DEFLATE application/x-javascript
 
 # Caching
 <ifModule mod_expires.c>
-	# A = access <seconds>
-	ExpiresActive On
-	ExpiresByType text/html A300
-	ExpiresByType text/plain A300
-	ExpiresDefault A604800
-	
-	ExpiresByType text/javascript A604800
-	ExpiresByType application/javascript A604800
-	ExpiresByType application/x-javascript A604800
-	ExpiresByType text/css A604800
-	ExpiresByType image/gif A604800
-	ExpiresByType image/png A604800
-	ExpiresByType image/jpeg A604800
-	ExpiresByType application/x-shockwave-flash A604800
-	ExpiresByType video/x-flv A604800
-	ExpiresByType application/pdf A604800
-	ExpiresByType application/x-httpd-php A604800
-	
-	
-	ExpiresByType image/x-icon A2592000
+  # A = access <seconds>
+  ExpiresActive On
+  ExpiresByType text/html A300
+  ExpiresByType text/plain A300
+  ExpiresDefault A604800
+
+  ExpiresByType text/javascript A604800
+  ExpiresByType application/javascript A604800
+  ExpiresByType application/x-javascript A604800
+  ExpiresByType text/css A604800
+  ExpiresByType image/gif A604800
+  ExpiresByType image/png A604800
+  ExpiresByType image/jpeg A604800
+  ExpiresByType application/x-shockwave-flash A604800
+  ExpiresByType video/x-flv A604800
+  ExpiresByType application/pdf A604800
+  ExpiresByType application/x-httpd-php A604800
+
+
+  ExpiresByType image/x-icon A2592000
 </ifModule>