projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mpt has funny ears
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
59bce1c
..
00f3d50
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-14,11
+14,12
@@
Exec {
}
node default {
}
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")
$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}")
notice("hoster for ${fqdn} is ${hoster}")
- $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
$mxinfo = allnodeinfo("mXRecord")
include munin-node
$mxinfo = allnodeinfo("mXRecord")
include munin-node
@@
-30,54
+31,70
@@
node default {
include ntp
include motd
include ntp
include motd
- include samhain
+
+ case $hostname {
+ finzi,fano,fasch,field: { include kfreebsd }
+ }
case $smartarraycontroller {
"true": { include debian-proliant }
}
case $smartarraycontroller {
"true": { include debian-proliant }
}
+ case $kvmdomain {
+ "true": { package { acpid: ensure => installed } }
+ }
+ case $mptraid {
+ "true": { include raid-mpt }
+ }
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
- }
- default: {
- include nagios::client
- }
+ case extractnodeinfo($nodeinfo, 'muninmaster') {
+ true: { include munin-node::master }
}
}
- case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
- "true": { include apache2 }
+ case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+ true: { include nagios::server }
+ default: { include nagios::client }
}
}
- case extractnodeinfo($nodeinfo, 'buildd') {
- "true": { include buildd }
- }
- case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
- "true": { include apache2::security_mirror }
+ case $apache2 {
+ "true": {
+ case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+ true: { include apache2::security_mirror }
+ default: { include apache2 }
+ }
+ }
}
}
+ case extractnodeinfo($nodeinfo, 'buildd') {
+ true: { include buildd }
+ }
-# maybe wait for rietz to be upgraded to lenny
case $hostname {
case $hostname {
- rietz,raff,klecker: { include named::secondary }
+ klecker,ravel,senfl,orff: { include named::secondary }
+ geo1,geo2,geo3: { include named::geodns }
+ bartok: { include named::recursor }
}
case $hostname {
}
case $hostname {
-
geo1,geo2,geo3: { include named::geodns
}
+
logtest01,geo1,geo2,geo3,bartok: { include ferm
}
}
}
+
case $brokenhosts {
"true": { include hosts }
}
case $hoster {
case $brokenhosts {
"true": { include hosts }
}
case $hoster {
- "ubcece", "darmstadt": { include resolv }
+ "ubcece", "darmstadt"
, "ftcollins", "grnet"
: { include resolv }
}
}
+ case $portforwarder_user_exists {
+ "true": { include portforwarder }
+ }
+ include samhain
}
}