X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fssl-key-pins.erb;h=c46111d8ccad01a55b2ec0703ce7eb4851ed8a35;hb=b8e5c7cec6eb3936616770530da1e5dc9fd24b27;hp=ec5d1ec457e459a7480a0745988783ec46cf10c0;hpb=3818bc897c59535c34ba759ca729d7dd3e213e28;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/ssl-key-pins.erb b/modules/apache2/templates/ssl-key-pins.erb
index ec5d1ec45..c46111d8c 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=259200"
+      # 60 days
+      pin_info << "max-age=5184000"
       pin_str = pin_info.join("; ")
       res << "  Header always set Public-Key-Pins \"#{pin_str}\""
     else