Try different file names, to see if that pleases puppet

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

diff --git a/manifests/site.pp b/manifests/site.pp
index be13ab72738fb57cbabc0e4af0dd705c848f04df..6123122491d6661c7e8a7f66b40a7a283110f8fe 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,6 +40,10 @@ node default {
                include ganeti2
        }
 
+       if $::hostname == 'dinis' {
+               include bacula::director
+       }
+
        if $::kernel == Linux {
                include linux
                if $::kvmdomain {
@@ -52,6 +56,8 @@ node default {
        if $::mta == 'exim4' {
                if getfromhash($site::nodeinfo, 'heavy_exim') {
                        include exim::mx
+               } else {
+                       include exim
                }
        } elsif $::mta == 'postfix' {
                include postfix
@@ -63,10 +69,6 @@ node default {
                include apache2
        }
 
-       if $::rsyncd {
-               include rsyncd-log
-       }
-
        if $::hostname in [ravel,senfl,orff,draghi,diamond] {
                include named::authoritative
        } elsif $::hostname in [geo1,geo2,geo3] {