Simplify postgres fact

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

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