Merge branch 'master' of https://git.bettercrypto.org/ach-master

diff --git a/TODO.md b/TODO.md
index f06a20b..b1c290c 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -1,6 +1,6 @@
 Bug Fixes
 =========
-Reported by: @Wims80 http://twitter.com/wims80/status/425770704693239808
+DONE Reported by: @Wims80 http://twitter.com/wims80/status/425770704693239808
 Section Apache 2.1.1 recommends Rewrite instead of Redirect. Should be 301! (We correctly recommend 301 in the nginx section.)
 
 

diff --git a/src/configuration/Webservers/Apache/hsts-vhost b/src/configuration/Webservers/Apache/hsts-vhost
index 394b574..94d07e1 100644 (file)
--- a/src/configuration/Webservers/Apache/hsts-vhost
+++ b/src/configuration/Webservers/Apache/hsts-vhost
@@ -1,4 +1,3 @@
 <VirtualHost *:80>
-  RewriteEngine On
-  RewriteRule ^.*$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R=permanent]
+  Redirect permanent / https://SERVER_NAME/
 </VirtualHost>