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

diff --git a/manifests/site.pp b/manifests/site.pp
index bce16e630..22cf231e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,13 +21,12 @@ 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 hardware
 	include nagios::client
@@ -37,8 +36,13 @@ node default {
 	include unbound
 	include bacula::client
 	include autofs
-	include lvm
+	include dsa_lvm
+	include grub
 	include multipath
+	include popcon
+	include portforwarder
+	include postgres
+
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
 	} else {
@@ -48,31 +52,13 @@ node default {
 		}
 	}
 
-	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] {
+	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 $::hostname == 'dinis' {
-		include bacula::director
-	} else {
-		package { 'bacula-console':
-			ensure => purged;
-		}
-
-		file { '/etc/bacula/bconsole.conf':
-			ensure => absent;
-		}
-	}
-
-	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
 	}
@@ -97,41 +83,27 @@ node default {
 		include named::geodns
 	}
 
-	#if $::hostname in [diabelli,nono,tchaikovsky] {
-	#	include dacs
-	#}
-
-	if $::hostname in [beach,glinka,milanollo,lw01,lw02,lw03,lw04] {
-		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
-	}
-
 	if $::samhain {
 		include samhain
 	}
 
-	if $::hostname in [chopin,geo3,soler,wieck] {
-		include debian-org::radvd
-	}
-
-	if ($::postgres) {
-		include postgres
+	if $::hostname in [geo3,wieck] {
+		include debian_org::radvd
 	}
 
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hoster {
-		if $::hoster in [ynic] {
-			include lldp
-		}
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish
 	}
 }