From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 26 Sep 2016 20:08:54 +0000 (+0200)
Subject: samhain: also accept changes in etc/apache2/conf-available
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=760d26b23b80f0ebfea1b73683f6500dbbf160b8;p=mirror%2Fdsa-puppet.git

samhain: also accept changes in etc/apache2/conf-available
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index f9e76c0a9..39e91d572 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -129,9 +129,11 @@ file=/etc/init.d/.depend.start
 file=/etc/init.d/.depend.stop
 
 # These are the directories for the files we handle with puppet
-file=/etc/apache2/conf.d
+<% if classes.include?("apache2") -%>
+file=/etc/apache2/conf-available
 files=/etc/apache2/mods-enabled
 files=/etc/apache2/sites-available
+<% end -%>
 file=/etc/bacula
 file=/etc/samhain
 file=/etc/munin