X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=a504ecbc1b84cc32eb1c9e7a0e45e47da4a51c09;hb=6a6f323df04506d53a2d5fb8e30765ec216877d9;hp=1db00d81f6af53f8fed98284425522906b99c07e;hpb=2e3464fa1aa11ebb2586271246c8d586c56d44cc;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 1db00d81f..a504ecbc1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -36,12 +36,21 @@ node default {
 	include roles
 	include unbound
 
-	if $::hostname in [pasquini,tristano] {
+	if $::hostname in [pasquini,tristano,bertali,boito] {
 		include ganeti2
 	}
 
 	if $::hostname == 'dinis' {
-		include bacula-director
+		include bacula::director
+	}
+
+	if $::hostname in [berlioz, biber, draghi] {
+		include bacula::client
+		@@bacula::node { $::fqdn: }
+	}
+
+	if $::hostname == 'beethoven' {
+		include bacula::storage
 	}
 
 	if $::kernel == Linux {
@@ -79,7 +88,7 @@ node default {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,duarte,spohr,stabile] {
+	if $::hostname in [beethoven,duarte,spohr,stabile,beach] {
 		include nfs-server
 	}