summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-10-13 20:32:50 -0400
committerScott Ullrich <sullrich@pfsense.org>2009-10-13 20:32:50 -0400
commit9c03089271af16b8893fca760f98d1555db3fc0b (patch)
treec4e40061a25e263e0b2bba04d60600f7eb0879c6
parentc5dfeaf6c31999688034c22b4fcb56477f0b9bd7 (diff)
downloadpfsense-9c03089271af16b8893fca760f98d1555db3fc0b.zip
pfsense-9c03089271af16b8893fca760f98d1555db3fc0b.tar.gz
Revert "Allow setting of LB Server mode"
This reverts commit c5dfeaf6c31999688034c22b4fcb56477f0b9bd7.
-rw-r--r--etc/inc/vslb.inc12
1 files changed, 3 insertions, 9 deletions
diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc
index e4faef9..8792386 100644
--- a/etc/inc/vslb.inc
+++ b/etc/inc/vslb.inc
@@ -71,19 +71,13 @@ function slbd_configure() {
$svrcnt = 0;
$svrtxt = "";
$svrtxt = "\t:service-port={$config['load_balancer']['lbpool'][$i]['port']}:\\\n";
- if($config['load_balancer']['lbpool']) {
- if(is_array($config['load_balancer']['lbpool'][$i]['servers'])) {
+ if($config['load_balancer']['lbpool'])
+ if(is_array($config['load_balancer']['lbpool'][$i]['servers']))
foreach ($config['load_balancer']['lbpool'][$i]['servers'] as $lbsvr) {
$svrtxt .= "\t:{$svrcnt}={$lbsvr}:\\\n";
$svrcnt++;
}
- }
- }
- if($config['load_balancer']['lbpool'][$i]['behaviour'])
- $lb_pool_behaviour = $config['load_balancer']['lbpool'][$i]['behaviour'];
- else
- $lb_pool_behaviour = "round-robin";
- $slbdconf .= "\t:method={$lb_pool_behaviour}:\\\n";
+ $slbdconf .= "\t:method=round-robin:\\\n";
$slbdconf .= "\t:services={$svrcnt}:\\\n";
$slbdconf .= $svrtxt;
if($config['load_balancer']['lbpool'][$i]['monitor'] == "ICMP") {
OpenPOWER on IntegriCloud