projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to write resolv.conf if we have nameservers
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
b0d4129
..
8a19c50
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-16,10
+16,10
@@
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")
- $hoster
= whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
- $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber")
+ $hoster
info
= whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+ $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber"
, "purpose"
)
$mxinfo = allnodeinfo("mXRecord")
$mxinfo = allnodeinfo("mXRecord")
- notice("hoster for ${fqdn} is ${hoster}")
+ notice("hoster for ${fqdn} is ${hoster
info
}")
include munin-node
include syslog-ng
include munin-node
include syslog-ng
@@
-43,8
+43,8
@@
node default {
case $kvmdomain {
"true": {
package { acpid: ensure => installed }
case $kvmdomain {
"true": {
package { acpid: ensure => installed }
- case
extractnodeinfo
($nodeinfo, 'squeeze') {
-
'true'
: { package { acpi-support-base: ensure => installed } }
+ case
getfromhash
($nodeinfo, 'squeeze') {
+
true
: { package { acpi-support-base: ensure => installed } }
}
}
}
}
}
}
@@
-54,28
+54,35
@@
node default {
case $mta {
"exim4": {
case $mta {
"exim4": {
- case
extractnodeinfo
($nodeinfo, 'heavy_exim') {
-
'true'
: { include exim::mx }
+ case
getfromhash
($nodeinfo, 'heavy_exim') {
+
true
: { include exim::mx }
default: { include exim }
}
}
}
default: { include exim }
}
}
}
- case extractnodeinfo($nodeinfo, 'muninmaster') {
+ case getfromhash($nodeinfo, 'puppetmaster') {
+ true: { include puppetmaster }
+ }
+
+ case getfromhash($nodeinfo, 'muninmaster') {
true: { include munin-node::master }
}
true: { include munin-node::master }
}
- case
extractnodeinfo
($nodeinfo, 'nagiosmaster') {
+ case
getfromhash
($nodeinfo, 'nagiosmaster') {
true: { include nagios::server }
default: { include nagios::client }
}
case $apache2 {
"true": {
true: { include nagios::server }
default: { include nagios::client }
}
case $apache2 {
"true": {
- case
extractnodeinfo
($nodeinfo, 'apache2_security_mirror') {
+ case
getfromhash
($nodeinfo, 'apache2_security_mirror') {
true: { include apache2::security_mirror }
true: { include apache2::security_mirror }
- default: { include apache2 }
}
}
+ case getfromhash($nodeinfo, 'apache2_www_mirror') {
+ true: { include apache2::www_mirror }
+ }
+ include apache2
}
}
}
}
@@
-84,8
+91,8
@@
node default {
}
}
- case
extractnodeinfo
($nodeinfo, 'buildd') {
-
'true'
: {
+ case
getfromhash
($nodeinfo, 'buildd') {
+
true
: {
include buildd
}
}
include buildd
}
}
@@
-115,8
+122,9
@@
node default {
case $brokenhosts {
"true": { include hosts }
}
case $brokenhosts {
"true": { include hosts }
}
- case $hoster {
- "ubcece", "darmstadt", "ftcollins", "grnet": { include resolv }
+ case getfromhash($hosterinfo, 'nameservers') {
+ false: {}
+ default: { include resolv }
}
case $portforwarder_user_exists {
"true": { include portforwarder }
}
case $portforwarder_user_exists {
"true": { include portforwarder }
@@
-128,7
+136,7
@@
node default {
byrd,schuetz,tchaikovsky: {
include krb
}
byrd,schuetz,tchaikovsky: {
include krb
}
- draghi,quantz
,samosa
: {
+ draghi,quantz: {
include krb
include afs
}
include krb
include afs
}
@@
-137,6
+145,12
@@
node default {
include afs::server
}
}
include afs::server
}
}
+
+ case $hostname {
+ chopin,geo3,soler,wieck: {
+ include debian-radvd
+ }
+ }
}
# vim:set et:
}
# vim:set et: