X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fapache2%2Ftemplates%2Fssl-key-pins.erb;h=0b4b162b21309e28ed861451d7a4979dffa1746e;hb=56a9fedb6bdd65c182e0d9b33472abcff5641158;hp=f79cfffe6d8299dbb80230b3e39c013a8b8c6d75;hpb=e116c9247d418e6fcd8072e0b20e1496ec759117;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/ssl-key-pins.erb b/modules/apache2/templates/ssl-key-pins.erb
index f79cfffe6..0b4b162b2 100644
--- a/modules/apache2/templates/ssl-key-pins.erb
+++ b/modules/apache2/templates/ssl-key-pins.erb
@@ -6,7 +6,7 @@
 <IfModule mod_macro.c>
 
 <%=
-  $cert_dir_le = '/srv/puppet.debian.org/from-letsencrypt'
+  $cert_dir_le = scope().call_function('hiera', ['paths.letsencrypt_dir'])
   $cert_dir_backup = '/srv/puppet.debian.org/backup-keys'
 
   def make_pin_macro(site)
@@ -23,7 +23,8 @@
     res << "<Macro http-pkp-#{site}>"
     if pin_info.size >= 2 then
       pin_info = pin_info.map{ |x| x.gsub('"', '\"') }
-      pin_info << "max-age=10800"
+      # 60 days
+      pin_info << "max-age=5184000"
       pin_str = pin_info.join("; ")
       res << "  Header always set Public-Key-Pins \"#{pin_str}\""
     else
@@ -37,7 +38,7 @@
   end
 
   macros = []
-  Dir.glob("#{$cert_dir_le}/*.pin") do |pinfile|
+  Dir.glob("#{$cert_dir_le}/*.pin").sort.each do |pinfile|
     site = File.basename(pinfile, '.pin')
     macros << make_pin_macro(site)
   end