projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add ullmann.debian.org Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
be13ab7
..
931c6d0
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-36,10
+36,22
@@
node default {
include roles
include unbound
include roles
include unbound
- if $::hostname in [pasquini,tristano] {
+ if $::hostname in [pasquini,tristano
,bertali,boito
] {
include ganeti2
}
include ganeti2
}
+ if $::hostname == 'dinis' {
+ include bacula::director
+ }
+
+ if $::hostname in [berlioz] {
+ include bacula::client
+ }
+
+ if $::hostname == 'beethoven' {
+ include bacula::storage
+ }
+
if $::kernel == Linux {
include linux
if $::kvmdomain {
if $::kernel == Linux {
include linux
if $::kvmdomain {
@@
-52,6
+64,8
@@
node default {
if $::mta == 'exim4' {
if getfromhash($site::nodeinfo, 'heavy_exim') {
include exim::mx
if $::mta == 'exim4' {
if getfromhash($site::nodeinfo, 'heavy_exim') {
include exim::mx
+ } else {
+ include exim
}
} elsif $::mta == 'postfix' {
include postfix
}
} elsif $::mta == 'postfix' {
include postfix
@@
-63,10
+77,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] {
@@
-77,7
+87,7
@@
node default {
include dacs
}
include dacs
}
- if $::hostname in [beethoven,duarte,spohr,stabile] {
+ if $::hostname in [beethoven,duarte,spohr,stabile
,beach
] {
include nfs-server
}
include nfs-server
}