projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops, wrong dependency
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
9e657d5
..
953000e
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-18,12
+18,12
@@
node default {
include sudo
include debian-org
include monit
include sudo
include debian-org
include monit
- include samhain
include apt-keys
$nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
include motd
include apt-keys
$nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
include motd
+ include samhain
case $smartarraycontroller {
"true": { include debian-proliant }
case $smartarraycontroller {
"true": { include debian-proliant }
@@
-31,7
+31,12
@@
node default {
}
case $mta {
}
case $mta {
- "exim4": { include exim }
+ "exim4": {
+ case extractnodeinfo($nodeinfo, 'heavy_exim') {
+ "true": { include exim::mx }
+ default: { include exim }
+ }
+ }
default: {}
}
default: {}
}
@@
-45,19
+50,15
@@
node default {
}
}
}
}
- case $apache2 {
- "true": { case $hostname {
- carver,rore,draghi,tartini,samosa,duarte: { include apache2 }
- default: {}
- } }
- default: {}
- }
+ case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+ "true": { include apache2 }
+ default: { }
+ }
- case $hostname {
- ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
- { include buildd }
- default: {}
- }
+ case extractnodeinfo($nodeinfo, 'buildd') {
+ "true": { include buildd }
+ default: { }
+ }
# maybe wait for rietz to be upgraded to lenny
# case $hostname {
# maybe wait for rietz to be upgraded to lenny
# case $hostname {
@@
-66,11
+67,11
@@
node default {
# default: {}
# }
# default: {}
# }
- case $hostname {
- geo1,geo2,geo3:
- { include geodns }
- default: {}
- }
+
case $hostname {
+
geo1,geo2,geo3:
+
{ include geodns }
+
default: {}
+
}
}
node penalosa inherits default {
}
node penalosa inherits default {