X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=22cf231e6d10ab502eebea7b551cd51ccefcd6e5;hb=c828a1b822d2987966270de951718a77b2a08511;hp=e56ca7d112f44be264fb56a366d9d7a78c82bed9;hpb=b9671e1043fdfc5f3aea127f51562dae2e9c9cf6;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index e56ca7d11..22cf231e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,47 +21,44 @@ 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
-
-	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {
-		include ganeti2
-	}
-
-	if $::hostname == 'dinis' {
-		include bacula::director
+	include autofs
+	include dsa_lvm
+	include grub
+	include multipath
+	include popcon
+	include portforwarder
+	include postgres
+
+	if $::lsbdistcodename == squeeze {
+		include roles::udldap::client
 	} else {
-		package { 'bacula-console':
-			ensure => purged;
-		}
-
-		file { '/etc/bacula/bconsole.conf':
-			ensure => absent;
+		include roles::pubsub::client
+		class { 'roles::udldap::client':
+			ensure => absent
 		}
 	}
 
-	if $::hostname == 'beethoven' {
-		include bacula::storage
+	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
 	}
 
-	if $::kernel == Linux {
+	if $::kernel == 'Linux' {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
+		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
@@ -82,43 +79,31 @@ 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] {
-		include nfs-server
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
+		include nfs_server
 	}
 
 	if $::brokenhosts {
 		include hosts
 	}
 
-	if $::portforwarder_user_exists {
-		include portforwarder
-	}
-
-	include samhain
-
-	if $::hostname in [chopin,geo3,soler,wieck] {
-		include debian-org::radvd
+	if $::samhain {
+		include samhain
 	}
 
-	if ($::postgres84 or $::postgres90) {
-		include postgres
-	}
-
-	if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
-		@@bacula::node { $::fqdn: }
+	if $::hostname in [geo3,wieck] {
+		include debian_org::radvd
 	}
 
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
+
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish
+	}
 }