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

diff --git a/manifests/site.pp b/manifests/site.pp
index be13ab72..e56ca7d1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,11 +35,28 @@ node default {
 	include resolv
 	include roles
 	include unbound
+	include bacula::client
 
-	if $::hostname in [pasquini,tristano] {
+	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {
 		include ganeti2
 	}
 
+	if $::hostname == 'dinis' {
+		include bacula::director
+	} else {
+		package { 'bacula-console':
+			ensure => purged;
+		}
+
+		file { '/etc/bacula/bconsole.conf':
+			ensure => absent;
+		}
+	}
+
+	if $::hostname == 'beethoven' {
+		include bacula::storage
+	}
+
 	if $::kernel == Linux {
 		include linux
 		if $::kvmdomain {
@@ -52,6 +69,8 @@ node default {
 	if $::mta == 'exim4' {
 		if getfromhash($site::nodeinfo, 'heavy_exim') {
 			include exim::mx
+		} else {
+			include exim
 		}
 	} elsif $::mta == 'postfix' {
 		include postfix
@@ -63,10 +82,6 @@ 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] {
@@ -77,7 +92,7 @@ node default {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,duarte,spohr,stabile] {
+	if $::hostname in [beethoven,spohr,stabile,beach] {
 		include nfs-server
 	}
 
@@ -99,6 +114,10 @@ node default {
 		include postgres
 	}
 
+	if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
+		@@bacula::node { $::fqdn: }
+	}
+
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}