add ftp_master

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

diff --git a/manifests/site.pp b/manifests/site.pp
index acde9e3..cadc12e 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -55,18 +55,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] {