make samhain installation conditional

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index 66236f4b135da63c0f63615480047dfd301d5fd2..4ce4dde44e5f079ad7ce0eb01f59a2d2148d10f1 100644 (file)
--- 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 4404d6fba0e5142f021a7e85ec679b1230071756..0843c256c3a94257a83671724b15e7a9733cb17e 100644 (file)
--- 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