Fix /etc/exim4/submission-domains generation

[mirror/dsa-puppet.git] / modules / apache2 / templates / ssl-key-pins.erb

diff --git a/modules/apache2/templates/ssl-key-pins.erb b/modules/apache2/templates/ssl-key-pins.erb
index 7e891a2..0b4b162 100644 (file)
--- 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