# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1461425327 -3600
# Node ID e50dab7495d7d58eb121e1877eadf7b17fc8a398
# Parent  32d9331af12c7cc33846517b8e9358a1b39625e4
Make sure that we're always setting HSTS headers, even when cannonicalising domains

diff -r 32d9331af12c -r e50dab7495d7 modules/website/manifests/https.pp
--- a/modules/website/manifests/https.pp	Thu Apr 21 20:53:37 2016 +0100
+++ b/modules/website/manifests/https.pp	Sat Apr 23 16:28:47 2016 +0100
@@ -29,7 +29,7 @@
   $logpart = $shortname
   $shortdomain = domain_to_short_domain($name)
 
-  $custom_conf0 = 'Header add Strict-Transport-Security "max-age=16070400; includeSubDomains"'
+  $custom_conf0 = 'Header always set Strict-Transport-Security "max-age=16070400; includeSubDomains"'
 
   if $force_no_index {
     $custom_conf1 = "$custom_conf0
diff -r 32d9331af12c -r e50dab7495d7 modules/website/manifests/https/redir.pp
--- a/modules/website/manifests/https/redir.pp	Thu Apr 21 20:53:37 2016 +0100
+++ b/modules/website/manifests/https/redir.pp	Sat Apr 23 16:28:47 2016 +0100
@@ -97,7 +97,7 @@
     docroot_group   => $group,
     redirect_status => 'permanent',
     redirect_dest   => $redir,
-    custom_fragment => 'Header add Strict-Transport-Security "max-age=16070400; includeSubDomains"',
+    custom_fragment => 'Header always set Strict-Transport-Security "max-age=16070400; includeSubDomains"',
     logroot         => '/var/log/apache/',
     access_log_file => "access_${logpart}${log_extra}.log",
     error_log_file  => "error_${logpart}${log_extra}.log",