projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move hosterinfo into nodeinfo
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
e4c46bd
..
f0699a9
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-16,10
+16,7
@@
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")
- $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose")
- $mxinfo = allnodeinfo("mXRecord")
- notice("hoster for ${fqdn} is ${hosterinfo}")
+ $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
include munin-node
include syslog-ng
include munin-node
include syslog-ng
@@
-100,8
+97,18
@@
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,s
chein,s
pohr,widor: { include named::recursor }
+ franck,liszt,master,samosa,spohr,widor: { include named::recursor }
}
}
+ case $hostname {
+ ries: {
+ include unbound
+ $runs_local_resolver = true
+ }
+ default: {
+ $runs_local_resolver = false
+ }
+ }
+ include resolv
case $kernel {
Linux: {
case $kernel {
Linux: {
@@
-122,10
+129,6
@@
node default {
case $brokenhosts {
"true": { include hosts }
}
case $brokenhosts {
"true": { include hosts }
}
- case getfromhash($hosterinfo, 'nameservers') {
- false: {}
- default: { include resolv }
- }
case $portforwarder_user_exists {
"true": { include portforwarder }
}
case $portforwarder_user_exists {
"true": { include portforwarder }
}