X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=091e769bdc195b8248ee0d70b12f35accb25f626;hb=13e495c55be6f08f72739620b0dcbff2b9635474;hp=29f9d5aa49d9e940aec00b60a6511da4ef68cccc;hpb=501e88f916b62cdc232b204457a82ee77ab089b2;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 29f9d5aa4..091e769bd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,15 +29,27 @@ 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 dsa_lvm
+	include grub
+	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,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10] {
 		include ganeti2
 	}
 
@@ -53,15 +65,13 @@ node default {
 		}
 	}
 
-	if $::hostname == 'beethoven' {
+	if $::hostname == 'storace' {
 		include bacula::storage
 	}
 
 	if $::kernel == Linux {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
+		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
@@ -79,20 +89,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 [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
 		include nfs-server
 	}
 
@@ -104,21 +114,26 @@ node default {
 		include portforwarder
 	}
 
-	include samhain
+	if $::samhain {
+		include samhain
+	}
 
-	if $::hostname in [chopin,geo3,soler,wieck] {
+	if $::hostname in [geo3,wieck] {
 		include debian-org::radvd
 	}
 
-	if ($::postgres84 or $::postgres90) {
+	if ($::postgres) {
 		include postgres
 	}
 
-	if $::hostname in ['beethoven', 'berlioz', 'biber', 'diabelli', 'dinis', 'draghi', 'widor', 'wolkenstein'] {
-		@@bacula::node { $::fqdn: }
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
+
+	if $::hoster {
+		if $::hoster in [ynic] {
+			include lldp
+		}
+	}
 }
+