nagiosadm icinga reload, II

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index e56ca7d..bdbdb28 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -110,15 +110,17 @@ node default {
                include debian-org::radvd
        }
 
-       if ($::postgres84 or $::postgres90) {
+       if ($::postgres) {
                include postgres
        }
 
-       if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
-               @@bacula::node { $::fqdn: }
-       }
-
        if $::spamd {
                munin::check { 'spamassassin': }
        }
+
+        if $::hoster {
+               if $::hoster in [ynic] {
+                       include lldp
+               }
+       }
 }