From 327ef8eb3244f79e1b669dca792c83d45657f7d4 Mon Sep 17 00:00:00 2001 From: Warren Baker Date: Tue, 3 May 2011 10:07:47 +0200 Subject: Use correct config variable and fix some whitespaces. --- etc/inc/vslb.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'etc/inc/vslb.inc') diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc index f984b60..953c356 100644 --- a/etc/inc/vslb.inc +++ b/etc/inc/vslb.inc @@ -233,23 +233,23 @@ function relayd_configure() { $conf .= $proto; } } - if(is_array($vs_a)) { + if(is_array($vs_a)) { for ($i = 0; isset($vs_a[$i]); $i++) { switch($vs_a[$i]['mode']) { case 'redirect_mode': { - $conf .= "redirect \"{$vs_a[$i]['name']}\" {\n"; - $conf .= " listen on {$vs_a[$i]['ipaddr']} port {$vs_a[$i]['port']}\n"; - $conf .= " forward to <{$vs_a[$i]['pool']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} timeout 1000\n"; + $conf .= "redirect \"{$vs_a[$i]['name']}\" {\n"; + $conf .= " listen on {$vs_a[$i]['ipaddr']} port {$vs_a[$i]['port']}\n"; + $conf .= " forward to <{$vs_a[$i]['pool']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} timeout 1000\n"; - if (isset($conf['system']['lb_use_sticky'])) - $conf .= " sticky-address\n"; + if (isset($config['system']['lb_use_sticky'])) + $conf .= " sticky-address\n"; - # sitedown MUST use the same port as the primary pool - sucks, but it's a relayd thing - if (isset($vs_a[$i]['sitedown']) && strlen($vs_a[$i]['sitedown']) > 0) - $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} timeout 1000\n"; + # sitedown MUST use the same port as the primary pool - sucks, but it's a relayd thing + if (isset($vs_a[$i]['sitedown']) && strlen($vs_a[$i]['sitedown']) > 0) + $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} timeout 1000\n"; - $conf .= "}\n"; - break; + $conf .= "}\n"; + break; } case 'relay': { $conf .= "relay \"{$vs_a[$i]['name']}\" {\n"; -- cgit v1.1