X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=29ac94ff41e15df25b4933e567b78a35a8a3e571;hb=208e196386d2de86fabbfdf2c305cb78290996d8;hp=3e4e39d6702d21bbf31174901d733f8a1888458c;hpb=0138dbc335a697fae4cd7ac765776857582cef41;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 3e4e39d67..29ac94ff4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -20,7 +20,7 @@ Service {
 
 node default {
 	# we really should rename this one
-	include site
+	include deprecated
 	include base
 
 	# this is magic: it will include whatever classes says we should
@@ -32,7 +32,7 @@ node default {
 		ensure => absent
 	}
 
-	if getfromhash($site::nodeinfo, 'ganeti') {
+	if getfromhash($deprecated::nodeinfo, 'ganeti') {
 		include ganeti2
 	}
 
@@ -41,18 +41,6 @@ node default {
 		include acpi
 	}
 
-	if $::mta == 'exim4' {
-		if getfromhash($site::nodeinfo, 'heavy_exim') {
-			include exim::mx
-		} else {
-			include exim
-		}
-	} elsif $::mta == 'postfix' {
-		include postfix
-	} else {
-		include exim
-	}
-
 	if $::apache2 {
 		include apache2
 	}