projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make site::aptrepo a proper type
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
3cb7b30
..
acde9e3
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-34,6
+34,7
@@
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
@@
-41,14
+42,13
@@
node default {
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
if $::mta == 'exim4' {
if getfromhash($site::nodeinfo, 'heavy_exim') {
include exim::mx
@@
-59,10
+59,6
@@
node default {
include postfix
}
include postfix
}
- if $::lsbdistcodename != 'lenny' {
- include unbound
- }
-
if $::apache2 {
include apache2
}
if $::apache2 {
include apache2
}
@@
-75,8
+71,6
@@
node default {
include named::authoritative
} elsif $::hostname in [geo1,geo2,geo3] {
include named::geodns
include named::authoritative
} elsif $::hostname in [geo1,geo2,geo3] {
include named::geodns
- } elsif $::hostname == 'liszt' {
- include named::recursor
}
if $::hostname in [diabelli,nono,spohr] {
}
if $::hostname in [diabelli,nono,spohr] {