X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=93749bfc1505f51c532bbe3966914e279cc9e2a0;hb=991b6ec9c0c8ece2935c922b9c5c315ccde6deb8;hp=bdbdb2823c16697298dd675d95c7577c995ae77a;hpb=d4955deea2b8c932ec1f6115115e33cf1b002a23;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index bdbdb2823..93749bfc1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,15 +29,26 @@ node default {
 	include ntp
 	include ntpdate
 	include ssl
-	include motd
 	include hardware
 	include nagios::client
 	include resolv
 	include roles
+	include motd
 	include unbound
 	include bacula::client
+	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,byrd,clementi] {
+	if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,csail-node01,csail-node02,grnet-node01,grnet-node02] {
 		include ganeti2
 	}
 
@@ -53,7 +64,7 @@ node default {
 		}
 	}
 
-	if $::hostname == 'beethoven' {
+	if $::hostname == 'storace' {
 		include bacula::storage
 	}
 
@@ -79,20 +90,20 @@ node default {
 	}
 
 	if $::apache2 {
-		include apache2
+		if !$::hostname in [oyens] {
+			include apache2
+		}
 	}
 
-	if $::hostname in [ravel,senfl,orff,draghi,diamond] {
-		include named::authoritative
-	} elsif $::hostname in [geo1,geo2,geo3] {
+	if $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
 	}
 
-	if $::hostname in [diabelli,nono,spohr] {
-		include dacs
-	}
+	#if $::hostname in [diabelli,nono,tchaikovsky] {
+	#	include dacs
+	#}
 
-	if $::hostname in [beethoven,spohr,stabile,beach] {
+	if $::hostname in [beach,glinka,milanollo,lw01,lw02,lw03,lw04] {
 		include nfs-server
 	}
 
@@ -104,7 +115,9 @@ node default {
 		include portforwarder
 	}
 
-	include samhain
+	if $::samhain {
+		include samhain
+	}
 
 	if $::hostname in [chopin,geo3,soler,wieck] {
 		include debian-org::radvd
@@ -118,7 +131,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-        if $::hoster {
+	if $::hoster {
 		if $::hoster in [ynic] {
 			include lldp
 		}