From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 23 Sep 2016 20:42:53 +0000 (+0200)
Subject: ignore changes to /etc/apache2/conf-available/puppet-ssl-key-pins.conf
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=521ca9f3e8f67b80c2d7d23a79c037de315eefa4;p=mirror%2Fdsa-puppet.git

ignore changes to /etc/apache2/conf-available/puppet-ssl-key-pins.conf
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 556ab2033..f9e76c0a9 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -110,6 +110,9 @@ file=/etc/static-clients.conf
 <% elsif classes.include?("roles::static_source") -%>
 file=/etc/static-clients.conf
 <% end -%>
+<% if classes.include?("apache2") -%>
+file=/etc/apache2/conf-available/puppet-ssl-key-pins.conf
+<% end -%>
 file=/etc/multipath/wwids
 
 #