X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=a3c219cc06f0bf5b8b0fbd64f68f381562409eea;hb=a9901ca263d6a355acb205f15e97251ed41f2e36;hp=ff7d3cd722cd3459bb2a74e45e591e87e73b403a;hpb=54b3cfe88cd6e52e3029df1a11595dafdb016ae5;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index ff7d3cd7..a3c219cc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -39,12 +39,19 @@ node default {
 	include autofs
 	include lvm
 	include multipath
+	if $::lsbdistcodename == squeeze {
+		include roles::udldap::client
+	} else {
+		include roles::pubsub::client
+		class { 'roles::udldap::client':
+			ensure => absent
+		}
+	}
 
-	if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14] {
+	if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,dijkstra,luchesi,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8] {
 		include ganeti2
 	}
 
-
 	if $::hostname == 'dinis' {
 		include bacula::director
 	} else {
@@ -86,27 +93,18 @@ node default {
 		include apache2
 	}
 
-	if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
-		include named::authoritative
-	} elsif $::hostname in [geo1,geo2,geo3] {
+	if $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
 	}
-	if $::hostname in [orff] {
-		include dnsextras::entries
-	}
 
-	if $::hostname in [diabelli,nono] {
-		include dacs
-	}
+	#if $::hostname in [diabelli,nono,tchaikovsky] {
+	#	include dacs
+	#}
 
-	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
+	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara,lw01,lw02,lw03,lw04] {
 		include nfs-server
 	}
 
-	if $::hostname == 'vieuxtemps' {
-		include varnish
-	}
-
 	if $::brokenhosts {
 		include hosts
 	}