From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 29 Jul 2012 10:02:03 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dd13b76c85dcc89da5ec4eb8ba90f5a69b0dde4d;hp=5cb1933757800bad9ba98090351aec972403e00d;p=dsa-puppet.git

Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  we want the output
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 775c6a17..e00a87d0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,6 +35,7 @@ node default {
 	include resolv
 	include roles
 	include unbound
+	include bacula::client
 
 	if $::hostname in [pasquini,tristano,bertali,boito,byrd] {
 		include ganeti2
@@ -44,10 +45,6 @@ node default {
 		include bacula::director
 	}
 
-	if $::hostname in [berlioz, biber, draghi, widor, wolkenstein] {
-		include bacula::client
-	}
-
 	if $::hostname == 'beethoven' {
 		include bacula::storage
 	}