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 resolv.conf module
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
7b60010
..
9398f1c
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-14,28
+14,34
@@
Exec {
}
node default {
}
node default {
+ $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+ $hoster = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+ notice("hoster for ${fqdn} is ${hoster}")
+
include munin-node
include sudo
include munin-node
include sudo
+ include ssh
include debian-org
include monit
include debian-org
include monit
- include samhain
include apt-keys
include apt-keys
-
- $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+ include ntp
include motd
include motd
+ include samhain
case $smartarraycontroller {
"true": { include debian-proliant }
case $smartarraycontroller {
"true": { include debian-proliant }
- default: {}
}
case $mta {
}
case $mta {
- "exim4": { include exim }
- default: {}
+ "exim4": {
+ case extractnodeinfo($nodeinfo, 'heavy_exim') {
+ "true": { include exim::mx }
+ default: { include exim }
+ }
+ }
}
}
-
case $hostname {
spohr: {
include nagios::server
case $hostname {
spohr: {
include nagios::server
@@
-45,26
+51,30
@@
node default {
}
}
}
}
- case $apache2 {
- "true": { case $hostname {
- carver,rore,tartini: { include apache2 }
- default: {}
- } }
- default: {}
+ case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+ "true": { include apache2 }
}
}
- case $hostname {
- ancina,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini:
- { include buildd }
- default: {}
+ case extractnodeinfo($nodeinfo, 'buildd') {
+ "true": { include buildd }
}
}
+ case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+ "true": { include apache2::security_mirror }
+ }
+
+
+# maybe wait for rietz to be upgraded to lenny
case $hostname {
case $hostname {
- geo1,geo2,geo3:
- { include geodns }
- default: {}
+ rietz,raff,klecker: { include named::secondary }
}
}
-}
-node penalosa inherits default {
- include hosts
+ case $hostname {
+ geo1,geo2,geo3: { include named::geodns }
+ }
+ case $brokenhosts {
+ "true": { include hosts }
+ }
+ case $hoster {
+ "ubcece": { include resolv }
+ }
}
}