From 71db93789266bdef72042a5f2e568f4edd293232 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Tue, 9 Jan 2018 17:04:28 +0100 Subject: [PATCH] Changed order of redirects Signed-off-by: Jim Martens --- .htaccess | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.htaccess b/.htaccess index b82259c..300ee4a 100644 --- a/.htaccess +++ b/.htaccess @@ -1,13 +1,13 @@ RewriteEngine On -RewriteCond %{HTTPS} !=on -RewriteCond %{ENV:HTTPS} !=on -RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L] - # rewrite jim.2martens.de to 2martens.de RewriteCond %{SERVER_NAME} ^jim\.2martens\.de [NC] RewriteRule ^(.*)$ https://2martens.de/$1 [L,R=301] +RewriteCond %{HTTPS} !=on +RewriteCond %{ENV:HTTPS} !=on +RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L] + # custom 404 error page ErrorDocument 404 /404.html