Simplify postgres fact

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8a09872c7533aa016b42a1ce634db6e018d0e936..46becc707a9ba88b902302c7450f810760fa149c 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,11 +110,11 @@ node default {
                include debian-org::radvd
        }
 
-       if ($::postgres84 or $::postgres90) {
+       if ($::postgres) {
                include postgres
        }
 
-       if $::hostname in ['berlioz', 'biber', 'draghi', 'widor', 'wolkenstein'] {
+       if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
                @@bacula::node { $::fqdn: }
        }