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 a prototype whohosts function for grouping machines at a common
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
af7c23d
..
b8dabd4
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-15,6
+15,7
@@
Exec {
node default {
$nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
node default {
$nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+ $hoster = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
include munin-node
include sudo
include munin-node
include sudo
@@
-22,6
+23,7
@@
node default {
include debian-org
include monit
include apt-keys
include debian-org
include monit
include apt-keys
+ include ntp
include motd
include samhain
include motd
include samhain
@@
-67,16
+69,19
@@
node default {
# maybe wait for rietz to be upgraded to lenny
# maybe wait for rietz to be upgraded to lenny
-
#
case $hostname {
-
#
rietz,raff,klecker:
-
# { include named-
secondary }
-
#
default: {}
-
#
}
+ case $hostname {
+ rietz,raff,klecker:
+
{ include named::
secondary }
+ default: {}
+ }
case $hostname {
geo1,geo2,geo3:
case $hostname {
geo1,geo2,geo3:
- { include geodns }
- default: {}
+ {
+ include named::geodns
+ }
+ default: {
+ }
}
case $brokenhosts {
"true": { include hosts }
}
case $brokenhosts {
"true": { include hosts }