X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=4dc9fc99c161bea83db65e0dcea125c7db77799b;hb=603eba44feb37f8c73b911248bbefbba704943fd;hp=be13ab72738fb57cbabc0e4af0dd705c848f04df;hpb=14060b9077bf8934a0670e00bec6068f714e28e2;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index be13ab72..4dc9fc99 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,17 +29,45 @@ 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,rossini,salieri,dijkstra,luchesi,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] {
 		include ganeti2
 	}
 
+	if $::hostname == 'dinis' {
+		include bacula::director
+	} else {
+		package { 'bacula-console':
+			ensure => purged;
+		}
+
+		file { '/etc/bacula/bconsole.conf':
+			ensure => absent;
+		}
+	}
+
+	if $::hostname == 'backuphost' {
+		include bacula::storage
+	}
+
 	if $::kernel == Linux {
 		include linux
 		if $::kvmdomain {
@@ -52,6 +80,8 @@ node default {
 	if $::mta == 'exim4' {
 		if getfromhash($site::nodeinfo, 'heavy_exim') {
 			include exim::mx
+		} else {
+			include exim
 		}
 	} elsif $::mta == 'postfix' {
 		include postfix
@@ -63,24 +93,22 @@ node default {
 		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
 	}
 
-	if $::hostname in [diabelli,nono,spohr] {
+	if $::hostname in [diabelli,nono] {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,duarte,spohr,stabile] {
+	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
 		include nfs-server
 	}
 
+	if $::hostname == 'vieuxtemps' {
+		include varnish
+	}
+
 	if $::brokenhosts {
 		include hosts
 	}
@@ -89,17 +117,25 @@ 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
 	}
 
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
+
+	if $::hoster {
+		if $::hoster in [ynic] {
+			include lldp
+		}
+	}
 }