X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=55d18f819bf5313391c9200101b170852458e3ba;hb=2bac5cd16d08f76d19b66c40d386009c24e87b76;hp=41d88df462434ab0159fc9b46632598d65d601d0;hpb=344f8c0d25aa99d14c8cbe9d958c127ded4525ef;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 41d88df46..55d18f819 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,23 +21,37 @@ Service {
 node default {
 	include site
 	include munin
-	include syslog-ng
+	include syslog_ng
 	include sudo
 	include ssh
-	include debian-org
+	include debian_org
 	include monit
-	include ntp
-	include ntpdate
+	include time
 	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
+	include popcon
+	include portforwarder
+
+	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 +67,13 @@ node default {
 		}
 	}
 
-	if $::hostname == 'beethoven' {
+	if $::hostname == 'storace' {
 		include bacula::storage
 	}
 
-	if $::kernel == Linux {
+	if $::kernel == 'Linux' {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
+		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
@@ -82,17 +94,11 @@ node default {
 		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 [beethoven,spohr,stabile,beach] {
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
 		include nfs-server
 	}
 
@@ -100,14 +106,12 @@ node default {
 		include hosts
 	}
 
-	if $::portforwarder_user_exists {
-		include portforwarder
+	if $::samhain {
+		include samhain
 	}
 
-	include samhain
-
-	if $::hostname in [chopin,geo3,soler,wieck] {
-		include debian-org::radvd
+	if $::hostname in [geo3,wieck] {
+		include debian_org::radvd
 	}
 
 	if ($::postgres) {
@@ -118,7 +122,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hoster in [ynic] {
-		include lldp
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish
 	}
 }