From c2a8153dfaca66f963fcc9f9b873a1c4bfeafb46 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 2 Mar 2013 10:31:24 +0000 Subject: [PATCH] make samhain installation conditional Signed-off-by: Stephen Gran --- manifests/site.pp | 6 ++++-- modules/debian-org/lib/facter/software.rb | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 66236f4b..4ce4dde4 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -108,7 +108,9 @@ node default { include portforwarder } - include samhain + if $::samhain { + include samhain + } if $::hostname in [chopin,geo3,soler,wieck] { include debian-org::radvd @@ -122,7 +124,7 @@ node default { munin::check { 'spamassassin': } } - if $::hoster { + if $::hoster { if $::hoster in [ynic] { include lldp } diff --git a/modules/debian-org/lib/facter/software.rb b/modules/debian-org/lib/facter/software.rb index 4404d6fb..0843c256 100644 --- a/modules/debian-org/lib/facter/software.rb +++ b/modules/debian-org/lib/facter/software.rb @@ -126,3 +126,12 @@ Facter.add("munin_async") do FileTest.exist?("/usr/share/munin/munin-async") end end +Facter.add("samhain") do + setcode do + if FileTest.exist?("/usr/sbin/samhain") + true + else + '' + end + end +end -- 2.39.2