projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
5cb1933
)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
author
Martin Zobel-Helas
<zobel@debian.org>
Sun, 29 Jul 2012 10:02:03 +0000
(12:02 +0200)
committer
Martin Zobel-Helas
<zobel@debian.org>
Sun, 29 Jul 2012 10:02:03 +0000
(12:02 +0200)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
we want the output
manifests/site.pp
patch
|
blob
|
history
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
775c6a1
..
e00a87d
100644
(file)
--- 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
}