projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let archvsync trigger snapshot (2nd snapshot instance) on sibelius
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
b0c9d7a
..
f57efd2
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-43,50
+43,43
@@
node default {
case $mta {
"exim4": {
case extractnodeinfo($nodeinfo, 'heavy_exim') {
case $mta {
"exim4": {
case extractnodeinfo($nodeinfo, 'heavy_exim') {
-
"true":
{ include exim::mx }
+
true:
{ include exim::mx }
default: { include exim }
}
}
}
case extractnodeinfo($nodeinfo, 'muninmaster') {
default: { include exim }
}
}
}
case extractnodeinfo($nodeinfo, 'muninmaster') {
- "true": {
- include munin-node::master
- }
+ true: { include munin-node::master }
}
case extractnodeinfo($nodeinfo, 'nagiosmaster') {
}
case extractnodeinfo($nodeinfo, 'nagiosmaster') {
- "true": {
- include nagios::server
- }
- default: {
- include nagios::client
- }
+ true: { include nagios::server }
+ default: { include nagios::client }
}
case $apache2 {
"true": {
case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
}
case $apache2 {
"true": {
case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-
"true":
{ include apache2::security_mirror }
+
true:
{ include apache2::security_mirror }
default: { include apache2 }
}
}
}
case extractnodeinfo($nodeinfo, 'buildd') {
default: { include apache2 }
}
}
}
case extractnodeinfo($nodeinfo, 'buildd') {
-
"true"
: { include buildd }
+
true
: { include buildd }
}
case $hostname {
klecker,ravel,senfl,orff: { include named::secondary }
}
case $hostname {
klecker,ravel,senfl,orff: { include named::secondary }
+ geo1,geo2,geo3: { include named::geodns }
}
case $hostname {
}
case $hostname {
- logtest01,geo1: { include ferm }
- }
- case $hostname {
- geo1,geo2,geo3: { include named::geodns }
+ logtest01,geo1,geo2,geo3: { include ferm }
}
}
+
case $brokenhosts {
"true": { include hosts }
}
case $brokenhosts {
"true": { include hosts }
}