X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fssl-key-pins.erb;h=0b4b162b21309e28ed861451d7a4979dffa1746e;hb=067090ebb5aafec7408e2a0676b857f8235ecbfc;hp=7e891a293b9e0678b398cade7d4d3e2ae2a39f76;hpb=c24d1e8183da7ca7317dbdb5bdb5262200ec7491;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/ssl-key-pins.erb b/modules/apache2/templates/ssl-key-pins.erb
index 7e891a293..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)
@@ -38,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