X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=9e0b813c2d6afc9e490a07f02d59651ff2e6fc45;hb=13857f1b71f89293f072e116c553d298cd3a39c0;hp=9b6d45ba715e2bbc2a9defb0ebeeabf2eeed79a8;hpb=6b1461d0ec2d6470003a69e33517e6d231253d81;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9b6d45ba7..9e0b813c2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,10 +40,10 @@ node default {
 	include lvm
 	include multipath
 	if $::lsbdistcodename == squeeze {
-		include roles::udlap::client
+		include roles::udldap::client
 	} else {
 		include roles::pubsub::client
-		class { 'roles::udlap::client':
+		class { 'roles::udldap::client':
 			ensure => absent
 		}
 	}
@@ -97,9 +97,9 @@ node default {
 		include named::geodns
 	}
 
-	if $::hostname in [diabelli,nono] {
-		include dacs
-	}
+	#if $::hostname in [diabelli,nono,tchaikovsky] {
+	#	include dacs
+	#}
 
 	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
 		include nfs-server