projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Also ignore puppet noise on s390
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
4d0ef65
..
8a5c971
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-16,9
+16,8
@@
Exec {
node default {
$localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
$nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
node default {
$localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
$nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
- $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
$allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
$allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
- notice(
"hoster for ${fqdn} is ${hosterinfo}"
)
+ notice(
sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') )
)
include munin-node
include syslog-ng
include munin-node
include syslog-ng
@@
-99,16
+98,13
@@
node default {
case $hostname {
klecker,ravel,senfl,orff,draghi: { include named::authoritative }
geo1,geo2,geo3: { include named::geodns }
case $hostname {
klecker,ravel,senfl,orff,draghi: { include named::authoritative }
geo1,geo2,geo3: { include named::geodns }
-
franck,liszt,master,samosa,spohr,widor:
{ include named::recursor }
+
liszt:
{ include named::recursor }
}
case $hostname {
}
case $hostname {
- ries: {
- include unbound
- $runs_local_resolver = true
- }
- default: {
- $runs_local_resolver = false
- }
+ franck,master,lobos,samosa,spohr,widor: { include unbound }
+ }
+ case getfromhash($nodeinfo, 'squeeze') {
+ true: { include unbound }
}
include resolv
}
include resolv
@@
-155,7
+151,12
@@
node default {
chopin,geo3,soler,wieck: {
include debian-radvd
}
chopin,geo3,soler,wieck: {
include debian-radvd
}
- }
+ }
+
+ case $kernel {
+ Linux: { include entropykey }
+ }
+
}
# vim:set et:
}
# vim:set et: