make bacula storage and director roles

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 28a443c..22cf231 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,6 +40,9 @@ node default {
        include grub
        include multipath
        include popcon
+       include portforwarder
+       include postgres
+
        if $::lsbdistcodename == squeeze {
                include roles::udldap::client
        } else {
@@ -53,22 +56,6 @@ node default {
                include ganeti2
        }
 
-       if $::hostname == 'dinis' {
-               include bacula::director
-       } else {
-               package { 'bacula-console':
-                       ensure => purged;
-               }
-
-               file { '/etc/bacula/bconsole.conf':
-                       ensure => absent;
-               }
-       }
-
-       if $::hostname == 'storace' {
-               include bacula::storage
-       }
-
        if $::kernel == 'Linux' {
                include linux
                include acpi
@@ -97,17 +84,13 @@ node default {
        }
 
        if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
-               include nfs-server
+               include nfs_server
        }
 
        if $::brokenhosts {
                include hosts
        }
 
-       if $::portforwarder_user_exists {
-               include portforwarder
-       }
-
        if $::samhain {
                include samhain
        }
@@ -116,10 +99,6 @@ node default {
                include debian_org::radvd
        }
 
-       if ($::postgres) {
-               include postgres
-       }
-
        if $::spamd {
                munin::check { 'spamassassin': }
        }