From 521ca9f3e8f67b80c2d7d23a79c037de315eefa4 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 23 Sep 2016 22:42:53 +0200 Subject: [PATCH] ignore changes to /etc/apache2/conf-available/puppet-ssl-key-pins.conf --- modules/samhain/templates/samhainrc.erb | 3 +++ 1 file changed, 3 insertions(+) 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 # -- 2.20.1