projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
c3a3657
..
07bc8ea
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-40,6
+40,14
@@
node default {
include ganeti2
}
include ganeti2
}
+ if $::hostname == 'dinis' {
+ include bacula::director
+ }
+
+ if $::hostname == 'beethoven' {
+ include bacula::storage
+ }
+
if $::kernel == Linux {
include linux
if $::kvmdomain {
if $::kernel == Linux {
include linux
if $::kvmdomain {
@@
-65,10
+73,6
@@
node default {
include apache2
}
include apache2
}
- if $::rsyncd {
- include rsyncd-log
- }
-
if $::hostname in [ravel,senfl,orff,draghi,diamond] {
include named::authoritative
} elsif $::hostname in [geo1,geo2,geo3] {
if $::hostname in [ravel,senfl,orff,draghi,diamond] {
include named::authoritative
} elsif $::hostname in [geo1,geo2,geo3] {