From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 23 Sep 2016 20:40:10 +0000 (+0000)
Subject: set pins always
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9d4afa904a0cb5612e99c2351149e6197e2fa08b;p=mirror%2Fdsa-puppet.git

set pins always
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/gen_hpkp_pin.rb b/modules/puppetmaster/lib/puppet/parser/functions/gen_hpkp_pin.rb
index f14a6fcba..913bdf3f5 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/gen_hpkp_pin.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/gen_hpkp_pin.rb
@@ -17,7 +17,7 @@ module Puppet::Parser::Functions
       pin_info = pin_info.map{ |x| x.gsub('"', '\"') }
       pin_info << "max-age=300"
       pin_str = pin_info.join("; ")
-      res << "  Header set Public-Key-Pins \"#{pin_str}\""
+      res << "  Header always set Public-Key-Pins \"#{pin_str}\""
     else
       res << "  # mod macro does not like empty macros, so here's some content:"
       res << "  <Directory /non-existant>"