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
9a09d54
..
8a5c971
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-16,10
+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")
- $hoster = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
- $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber")
- $mxinfo = allnodeinfo("mXRecord")
- notice("hoster for ${fqdn} is ${hoster}")
+ $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
+ notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
include munin-node
include syslog-ng
include munin-node
include syslog-ng
@@
-43,7
+41,7
@@
node default {
case $kvmdomain {
"true": {
package { acpid: ensure => installed }
case $kvmdomain {
"true": {
package { acpid: ensure => installed }
- case
extractnodeinfo
($nodeinfo, 'squeeze') {
+ case
getfromhash
($nodeinfo, 'squeeze') {
true: { package { acpi-support-base: ensure => installed } }
}
}
true: { package { acpi-support-base: ensure => installed } }
}
}
@@
-54,32
+52,32
@@
node default {
case $mta {
"exim4": {
case $mta {
"exim4": {
- case
extractnodeinfo
($nodeinfo, 'heavy_exim') {
+ case
getfromhash
($nodeinfo, 'heavy_exim') {
true: { include exim::mx }
default: { include exim }
}
}
}
true: { include exim::mx }
default: { include exim }
}
}
}
- case
extractnodeinfo
($nodeinfo, 'puppetmaster') {
+ case
getfromhash
($nodeinfo, 'puppetmaster') {
true: { include puppetmaster }
}
true: { include puppetmaster }
}
- case
extractnodeinfo
($nodeinfo, 'muninmaster') {
+ 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 }
}
- case
extractnodeinfo
($nodeinfo, 'apache2_www_mirror') {
+ case
getfromhash
($nodeinfo, 'apache2_www_mirror') {
true: { include apache2::www_mirror }
}
include apache2
true: { include apache2::www_mirror }
}
include apache2
@@
-91,7
+89,7
@@
node default {
}
}
- case
extractnodeinfo
($nodeinfo, 'buildd') {
+ case
getfromhash
($nodeinfo, 'buildd') {
true: {
include buildd
}
true: {
include buildd
}
@@
-100,8
+98,15
@@
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,schein,spohr,steffani,widor:
{ include named::recursor }
+
liszt:
{ include named::recursor }
}
}
+ case $hostname {
+ franck,master,lobos,samosa,spohr,widor: { include unbound }
+ }
+ case getfromhash($nodeinfo, 'squeeze') {
+ true: { include unbound }
+ }
+ include resolv
case $kernel {
Linux: {
case $kernel {
Linux: {
@@
-122,9
+127,6
@@
node default {
case $brokenhosts {
"true": { include hosts }
}
case $brokenhosts {
"true": { include hosts }
}
- case $hoster {
- "ubcece", "darmstadt", "ftcollins", "grnet": { include resolv }
- }
case $portforwarder_user_exists {
"true": { include portforwarder }
}
case $portforwarder_user_exists {
"true": { include portforwarder }
}
@@
-147,9
+149,14
@@
node default {
case $hostname {
chopin,geo3,soler,wieck: {
case $hostname {
chopin,geo3,soler,wieck: {
- include
sysctl
+ include
debian-radvd
}
}
- }
+ }
+
+ case $kernel {
+ Linux: { include entropykey }
+ }
+
}
# vim:set et:
}
# vim:set et: