Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

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

diff --git a/manifests/site.pp b/manifests/site.pp
index acde9e3992568a7a9c28fe5d06e114c0fb57a42d..40d9d33532ee1c3437ef9339c6e448d2506d7ee3 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,6 +40,18 @@ node default {
                include ganeti2
        }
 
+       if $::hostname == 'dinis' {
+               include bacula::director
+       }
+
+       if $::hostname in [berlioz] {
+               include bacula::client
+       }
+
+       if $::hostname == 'beethoven' {
+               include bacula::storage
+       }
+
        if $::kernel == Linux {
                include linux
                if $::kvmdomain {
@@ -55,18 +67,16 @@ node default {
                } else {
                        include exim
                }
-       } else {
+       } elsif $::mta == 'postfix' {
                include postfix
+       } else {
+               include exim
        }
 
        if $::apache2 {
                include apache2
        }
 
-       if $::rsyncd {
-               include rsyncd-log
-       }
-
        if $::hostname in [ravel,senfl,orff,draghi,diamond] {
                include named::authoritative
        } elsif $::hostname in [geo1,geo2,geo3] {