projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ok, you're starting to make cranky
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
953000e
..
af7c23d
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-14,14
+14,15
@@
Exec {
}
node default {
}
node default {
+ $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
include munin-node
include sudo
include munin-node
include sudo
+ include ssh
include debian-org
include monit
include apt-keys
include debian-org
include monit
include apt-keys
- $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-
include motd
include samhain
include motd
include samhain
@@
-59,6
+60,11
@@
node default {
"true": { include buildd }
default: { }
}
"true": { include buildd }
default: { }
}
+ case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+ "true": { include apache2::security_mirror }
+ default: { }
+ }
+
# maybe wait for rietz to be upgraded to lenny
# case $hostname {
# maybe wait for rietz to be upgraded to lenny
# case $hostname {
@@
-72,8
+78,8
@@
node default {
{ include geodns }
default: {}
}
{ include geodns }
default: {}
}
-}
-
-node penalosa inherits default {
- include hosts
+ case $brokenhosts {
+ "true": { include hosts }
+ default: {}
+ }
}
}