move bacula::node export to bacula::client

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

diff --git a/manifests/site.pp b/manifests/site.pp
index e00a87d032b0159df85750a2dfea134307c77c74..10156252372129119ce4fc196e9a4b32c3bd16d4 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,12 +37,20 @@ node default {
        include unbound
        include bacula::client
 
-       if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
+       if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {
                include ganeti2
        }
 
        if $::hostname == 'dinis' {
                include bacula::director
+       } else {
+               package { 'bacula-console':
+                       ensure => purged;
+               }
+
+               file { '/etc/bacula/bconsole.conf':
+                       ensure => absent;
+               }
        }
 
        if $::hostname == 'beethoven' {
@@ -102,7 +110,7 @@ node default {
                include debian-org::radvd
        }
 
-       if ($::postgres84 or $::postgres90) {
+       if ($::postgres) {
                include postgres
        }