X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=b735738c292bb192a2057acc42478611743f2f1f;hb=d8e7039e56190564d5080b85d48fe0f6a5b4624f;hp=6b8be82d0a121740f0aafd02791eb98f15764e72;hpb=e004cf0926cc3bdb95c0d71c79cd734b1e1cc806;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 6b8be82d0..b735738c2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -47,13 +47,9 @@ node default {
 	include tcp_bbr
 	include certregen::client
 
-	if $::lsbdistcodename == squeeze {
-		include roles::udldap::client
-	} else {
-		include roles::pubsub::client
-		class { 'roles::udldap::client':
-			ensure => absent
-		}
+	include roles::pubsub::client
+	class { 'roles::udldap::client':
+		ensure => absent
 	}
 
 	if getfromhash($site::nodeinfo, 'ganeti') {
@@ -81,10 +77,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
 	}