projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove kokkonen from mailout (our MX; RT#3977)
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
cadc12e
..
8a09872
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-35,11
+35,20
@@
node default {
include resolv
include roles
include unbound
include resolv
include roles
include unbound
+ include bacula::client
- if $::hostname in [pasquini,tristano] {
+ if $::hostname in [pasquini,tristano
,bertali,boito,byrd
] {
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 {
@@
-75,7
+84,7
@@
node default {
include dacs
}
include dacs
}
- if $::hostname in [beethoven,
duarte,spohr,stabile
] {
+ if $::hostname in [beethoven,
spohr,stabile,beach
] {
include nfs-server
}
include nfs-server
}
@@
-97,6
+106,10
@@
node default {
include postgres
}
include postgres
}
+ if $::hostname in ['berlioz', 'biber', 'draghi', 'widor', 'wolkenstein'] {
+ @@bacula::node { $::fqdn: }
+ }
+
if $::spamd {
munin::check { 'spamassassin': }
}
if $::spamd {
munin::check { 'spamassassin': }
}