X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=blobdiff_plain;f=manifests%2Fsite.pp;fp=manifests%2Fsite.pp;h=6ff112d29e7ff5a4f0df9cc5d2fe72082ed7ddb7;hp=3e4e39d6702d21bbf31174901d733f8a1888458c;hb=d0c098685b92334a611a0c596a35f538b95ead47;hpb=c7afa6d04e06776ac94206451153d6c0c0572495

diff --git a/manifests/site.pp b/manifests/site.pp
index 3e4e39d67..6ff112d29 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
 	}
 
@@ -42,7 +42,7 @@ node default {
 	}
 
 	if $::mta == 'exim4' {
-		if getfromhash($site::nodeinfo, 'heavy_exim') {
+		if getfromhash($deprecated::nodeinfo, 'heavy_exim') {
 			include exim::mx
 		} else {
 			include exim