From 620bc888c0ba262dbd7f655d27010b1f1689b484 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 26 Sep 2016 19:07:53 +0200 Subject: [PATCH] make pin macros conditional on mod_macro being present --- modules/apache2/templates/ssl-key-pins.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/apache2/templates/ssl-key-pins.erb b/modules/apache2/templates/ssl-key-pins.erb index 273cc69e3..41cfceaf8 100644 --- a/modules/apache2/templates/ssl-key-pins.erb +++ b/modules/apache2/templates/ssl-key-pins.erb @@ -3,6 +3,8 @@ ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git ## + + <%= $cert_dir_le = '/srv/puppet.debian.org/from-letsencrypt' $cert_dir_backup = '/srv/puppet.debian.org/backup-keys' @@ -41,3 +43,5 @@ end macros.join("\n") -%> + + -- 2.20.1