From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 1 Jan 2014 11:01:20 +0000 (+0100)
Subject: only set sts header if mod headers is loaded
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=cbc9550622c3b483a1a2d46e16b238856c904e8f;p=mirror%2Fdsa-puppet.git

only set sts header if mod headers is loaded
---

diff --git a/modules/apache2/files/puppet-ssl-macros b/modules/apache2/files/puppet-ssl-macros
index 69bc42438..db298bb58 100644
--- a/modules/apache2/files/puppet-ssl-macros
+++ b/modules/apache2/files/puppet-ssl-macros
@@ -1,8 +1,10 @@
 <IfModule mod_ssl.c>
   <IfModule mod_macro.c>
     <Macro common-ssl-HSTS>
-      # Add two month HSTS header
-      Header always add Strict-Transport-Security "max-age=5184000"
+      <IfModule mod_headers.c>
+        # Add two month HSTS header
+        Header always add Strict-Transport-Security "max-age=5184000"
+      </IfModule>
     </Macro>
 
     <Macro common-debian-service-ssl $name>