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
593be68
..
07bc8ea
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-34,41
+34,45
@@
node default {
include nagios::client
include resolv
include roles
include nagios::client
include resolv
include roles
+ include unbound
if $::hostname in [pasquini,tristano] {
include ganeti2
}
if $::hostname in [pasquini,tristano] {
include ganeti2
}
+ if $::hostname == 'dinis' {
+ include bacula::director
+ }
+
+ if $::hostname == 'beethoven' {
+ include bacula::storage
+ }
+
if $::kernel == Linux {
include linux
if $::kernel == Linux {
include linux
+ if $::kvmdomain {
+ include acpi
+ }
} elsif $::kernel == 'GNU/kFreeBSD' {
include kfreebsd
}
} elsif $::kernel == 'GNU/kFreeBSD' {
include kfreebsd
}
- if $::kvmdomain {
- include acpi
- }
-
if $::mta == 'exim4' {
if getfromhash($site::nodeinfo, 'heavy_exim') {
include exim::mx
} else {
include exim
}
if $::mta == 'exim4' {
if getfromhash($site::nodeinfo, 'heavy_exim') {
include exim::mx
} else {
include exim
}
- } els
e
{
+ } els
if $::mta == 'postfix'
{
include postfix
include postfix
+ } else {
+ include exim
}
}
- include unbound
-
if $::apache2 {
include apache2
}
if $::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] {