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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9c714a5c..be13ab72 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,5 @@
 Package {
-	require => File['/etc/apt/apt.conf.d/local-recommends'],
-	stage   => deploy_infra
+	require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
@@ -35,6 +34,7 @@ node default {
 	include nagios::client
 	include resolv
 	include roles
+	include unbound
 
 	if $::hostname in [pasquini,tristano] {
 		include ganeti2
@@ -42,26 +42,21 @@ node default {
 
 	if $::kernel == Linux {
 		include linux
+		if $::kvmdomain {
+			include acpi
+		}
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
 
-	if $::kvmdomain {
-		include acpi
-	}
-
 	if $::mta == 'exim4' {
 		if getfromhash($site::nodeinfo, 'heavy_exim') {
 			include exim::mx
-		} else {
-			include exim
 		}
-	} else {
+	} elsif $::mta == 'postfix' {
 		include postfix
-	}
-
-	if $::lsbdistcodename != 'lenny' {
-		include unbound
+	} else {
+		include exim
 	}
 
 	if $::apache2 {
@@ -76,8 +71,6 @@ node default {
 		include named::authoritative
 	} elsif $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
-	} elsif $::hostname == 'liszt' {
-		include named::recursor
 	}
 
 	if $::hostname in [diabelli,nono,spohr] {
@@ -109,8 +102,4 @@ node default {
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
-
-	if $::hostname in [chopin,franck,ravel] {
-		include vsftpd
-	}
 }