X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=cadc12ed4d8d2693733f2ed5aca02f7be8590712;hb=b98544412fd3916437b2250481b8a77c5edef40e;hp=be13ab72738fb57cbabc0e4af0dd705c848f04df;hpb=14060b9077bf8934a0670e00bec6068f714e28e2;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index be13ab72..cadc12ed 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -52,6 +52,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 +65,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] {