From ece3546e817fadf7f074a47325bb35b2f0066c30 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 22 Feb 2010 01:08:50 +0000 Subject: [PATCH] ok, so now extractnodeinfo comes back with the value true, rather than the string "true". I wonder how long this has been silently broken Signed-off-by: Stephen Gran --- manifests/site.pp | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index b0c9d7a1..23908f5e 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -43,50 +43,43 @@ node default { case $mta { "exim4": { case extractnodeinfo($nodeinfo, 'heavy_exim') { - "true": { include exim::mx } + true: { include exim::mx } default: { include exim } } } } case extractnodeinfo($nodeinfo, 'muninmaster') { - "true": { - include munin-node::master - } + true: { include munin-node::master } } 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') { - "true": { include apache2::security_mirror } + true: { include apache2::security_mirror } default: { include apache2 } } } } case extractnodeinfo($nodeinfo, 'buildd') { - "true": { include buildd } + true: { include buildd } } case $hostname { klecker,ravel,senfl,orff: { include named::secondary } + geo1,geo2,geo3: { include named::geodns } } case $hostname { logtest01,geo1: { include ferm } } - case $hostname { - geo1,geo2,geo3: { include named::geodns } - } + case $brokenhosts { "true": { include hosts } } -- 2.39.2