projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add the rest of the geo hosts to ferm class
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
b108579
..
f57efd2
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-17,6
+17,7
@@
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")
$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")
notice("hoster for ${fqdn} is ${hoster}")
$mxinfo = allnodeinfo("mXRecord")
notice("hoster for ${fqdn} is ${hoster}")
$mxinfo = allnodeinfo("mXRecord")
@@
-42,49
+43,50
@@
node default {
case $mta {
"exim4": {
case extractnodeinfo($nodeinfo, 'heavy_exim') {
case $mta {
"exim4": {
case extractnodeinfo($nodeinfo, 'heavy_exim') {
-
"true":
{ include exim::mx }
+
true:
{ include exim::mx }
default: { include exim }
}
}
}
default: { include exim }
}
}
}
- case $hostname {
- spohr: {
- include nagios::server
- include munin-node::master
- }
- default: {
- include nagios::client
- }
+ case extractnodeinfo($nodeinfo, 'muninmaster') {
+ true: { include munin-node::master }
+ }
+
+ case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+ true: { include nagios::server }
+ default: { include nagios::client }
}
case $apache2 {
"true": {
case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
}
case $apache2 {
"true": {
case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-
"true":
{ include apache2::security_mirror }
+
true:
{ include apache2::security_mirror }
default: { include apache2 }
}
}
}
case extractnodeinfo($nodeinfo, 'buildd') {
default: { include apache2 }
}
}
}
case extractnodeinfo($nodeinfo, 'buildd') {
-
"true"
: { include buildd }
+
true
: { include buildd }
}
case $hostname {
}
case $hostname {
- rietz,klecker,ravel,senfl: { include named::secondary }
+ klecker,ravel,senfl,orff: { include named::secondary }
+ geo1,geo2,geo3: { include named::geodns }
}
case $hostname {
}
case $hostname {
-
geo1,geo2,geo3: { include named::geodns
}
+
logtest01,geo1,geo2,geo3: { include ferm
}
}
}
+
case $brokenhosts {
"true": { include hosts }
}
case $hoster {
"ubcece", "darmstadt", "ftcollins", "grnet": { include resolv }
}
case $brokenhosts {
"true": { include hosts }
}
case $hoster {
"ubcece", "darmstadt", "ftcollins", "grnet": { include resolv }
}
- case $
hostname
{
-
brahms: { include ferm
}
+ case $
portforwarder_user_exists
{
+
"true": { include portforwarder
}
}
}
}
}