enable HTS everywhere

1 files changed, 5 insertions, 10 deletions

diff --git a/templates/vhosts/php_silverstripe/php_silverstripe.erb b/templates/vhosts/php_silverstripe/php_silverstripe.erb
index 2973d3e..de4dd5d 100644
--- a/templates/vhosts/php_silverstripe/php_silverstripe.erb
+++ b/templates/vhosts/php_silverstripe/php_silverstripe.erb
@@ -149,23 +149,20 @@
     <%- else -%>
     ErrorLog <%= logdir %>/error_log
     CustomLog <%= logdir %>/access_log combined
-
     <%- end -%>
-
     <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
 
+    AddDefaultCharset <%= default_charset %>
     <%- end -%>
     <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
+
     <IfModule mpm_itk_module>
         AssignUserId <%= run_uid+" "+run_gid %>
     </IfModule>
-
     <%- end -%>
-    <%- if ssl_mode.to_s == 'force' then -%>
+
     Header add Strict-Transport-Security "max-age=15768000"
 
-    <%- end -%>
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>
         <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
@@ -394,15 +391,13 @@
     ProxyPass / https://127.0.0.1/
     <%- end -%>
     ProxyPassReverse / https://127.0.0.1/
-
     <%- if default_charset.to_s != 'absent' then -%>
-    AddDefaultCharset <%= default_charset %>
 
+    AddDefaultCharset <%= default_charset %>
     <%- end -%>
-    <%- if ssl_mode.to_s == 'force' then -%>
+
     Header add Strict-Transport-Security "max-age=15768000"
 
-    <%- end -%>
     <%- if run_mode.to_s == 'static-itk' -%>
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>