X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=88f565d95d7bbbea8b12fbaed79502ed2f664f43;hb=5f25e6e23fc7a0f900ef5c32d066f91c82b9cfdb;hp=2933d23fa81c6517d7e8394c839b8d533e63bfc6;hpb=9ed89ed95202c7f1cd5afff59091b80ca2177528;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 2933d23fa..88f565d95 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,7 +19,10 @@ Service {
 }
 
 node default {
-	include site
+	# this is magic: it will include whatever classes says we should
+	# include, based on the value of the "classes" array
+	hiera_include('classes')
+
 	include munin
 	include syslog_ng
 	include sudo
@@ -77,10 +80,6 @@ node default {
 		include apache2
 	}
 
-	if $::hostname in [geo1,geo2,geo3] {
-		include named::geodns
-	}
-
 	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
 		include nfs_server
 	}