From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 26 Sep 2016 17:07:53 +0000 (+0200)
Subject: make pin macros conditional on mod_macro being present
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=620bc888c0ba262dbd7f655d27010b1f1689b484;p=mirror%2Fdsa-puppet.git

make pin macros conditional on mod_macro being present
---

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
 ##
 
+<IfModule mod_macro.c>
+
 <%=
   $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")
 -%>
+
+</IfModule>