X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=0695176a96a7f48e711045ff3324056263cc060c;hb=e200005317ddfcfbd8306fdef71a1e9240d0b123;hp=9c714a5c3e0cdb23840ec384ba1e7322f959aaef;hpb=382b96856d6c214d79ae17d7f3b919ed7ae99bf8;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9c714a5c..0695176a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,5 @@
 Package {
-	require => File['/etc/apt/apt.conf.d/local-recommends'],
-	stage   => deploy_infra
+	require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
@@ -30,61 +29,79 @@ 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] {
+	if $::hostname in [pasquini,tristano,bertali,boito,ubc-bl8,luchesi,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
 	}
 
+	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 {
 		include linux
+		if $::kvmdomain {
+			include acpi
+		}
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
 
-	if $::kvmdomain {
-		include acpi
-	}
-
 	if $::mta == 'exim4' {
 		if getfromhash($site::nodeinfo, 'heavy_exim') {
 			include exim::mx
 		} else {
 			include exim
 		}
-	} else {
+	} elsif $::mta == 'postfix' {
 		include postfix
-	}
-
-	if $::lsbdistcodename != 'lenny' {
-		include unbound
+	} else {
+		include exim
 	}
 
 	if $::apache2 {
 		include apache2
 	}
 
-	if $::rsyncd {
-		include rsyncd-log
-	}
-
-	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
-	} elsif $::hostname == 'liszt' {
-		include named::recursor
 	}
 
-	if $::hostname in [diabelli,nono,spohr] {
-		include dacs
-	}
+	#if $::hostname in [diabelli,nono,tchaikovsky] {
+	#	include dacs
+	#}
 
-	if $::hostname in [beethoven,duarte,spohr,stabile] {
+	if $::hostname in [beach,glinka,milanollo,lw01,lw02,lw03,lw04] {
 		include nfs-server
 	}
 
@@ -96,13 +113,15 @@ node default {
 		include portforwarder
 	}
 
-	include samhain
+	if $::samhain {
+		include samhain
+	}
 
 	if $::hostname in [chopin,geo3,soler,wieck] {
 		include debian-org::radvd
 	}
 
-	if ($::postgres84 or $::postgres90) {
+	if ($::postgres) {
 		include postgres
 	}
 
@@ -110,7 +129,9 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hostname in [chopin,franck,ravel] {
-		include vsftpd
+	if $::hoster {
+		if $::hoster in [ynic] {
+			include lldp
+		}
 	}
 }