X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=07bc8eab7957a7c960cb62410ea9216ccac336a5;hb=9f94bb1ad8d6a1eb092e2847d46865fd7d59a38e;hp=c3a3657c35f92c1a53c9cf77e3135f999a4163e9;hpb=a34cbcf6ea1c3a2b8a8b802655a3452824d457c6;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index c3a3657c3..07bc8eab7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,6 +40,14 @@ node default {
 		include ganeti2
 	}
 
+	if $::hostname == 'dinis' {
+		include bacula::director
+	}
+
+	if $::hostname == 'beethoven' {
+		include bacula::storage
+	}
+
 	if $::kernel == Linux {
 		include linux
 		if $::kvmdomain {
@@ -65,10 +73,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] {