diff options
| author | jim-p <jimp@pfsense.org> | 2012-09-26 13:20:39 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-09-26 13:20:39 -0400 |
| commit | 6e9b046e51f5728b8d8f0182b401476059040d1d (patch) | |
| tree | 911aacf1b1623c1ca876b2d7f721b196f450e734 /etc/inc/vslb.inc | |
| parent | fd3515f2b78184125e0f16a4a991660003ff7cd0 (diff) | |
| download | pfsense-6e9b046e51f5728b8d8f0182b401476059040d1d.zip pfsense-6e9b046e51f5728b8d8f0182b401476059040d1d.tar.gz | |
Due to the DHCP pool tag needing to be an array, rename the old LB "pool" variable to something else so it's not interpreted as an array.
Diffstat (limited to 'etc/inc/vslb.inc')
| -rw-r--r-- | etc/inc/vslb.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc index 0a975f0..1aed862 100644 --- a/etc/inc/vslb.inc +++ b/etc/inc/vslb.inc @@ -267,12 +267,12 @@ function relayd_configure($kill_first=false) { for ($i = 0; isset($vs_a[$i]); $i++) { $append_port_to_name = false; - if (is_alias($pools[$vs_a[$i]['pool']]['port'])) { - $dest_port_array = filter_expand_alias_array($pools[$vs_a[$i]['pool']]['port']); + if (is_alias($pools[$vs_a[$i]['poolname']]['port'])) { + $dest_port_array = filter_expand_alias_array($pools[$vs_a[$i]['poolname']]['port']); $append_port_to_name = true; } else { - $dest_port_array = array($pools[$vs_a[$i]['pool']]['port']); + $dest_port_array = array($pools[$vs_a[$i]['poolname']]['port']); } if (is_alias($vs_a[$i]['port'])) { $src_port_array = filter_expand_alias_array($vs_a[$i]['port']); @@ -331,26 +331,26 @@ function relayd_configure($kill_first=false) { $conf .= " protocol \"{$vs_a[$i]['relay_protocol']}\"\n"; } $lbmode = ""; - if ( $pools[$vs_a[$i]['pool']]['mode'] == "loadbalance" ) { + if ( $pools[$vs_a[$i]['poolname']]['mode'] == "loadbalance" ) { $lbmode = "mode loadbalance"; } - $conf .= " forward to <{$vs_a[$i]['pool']}> port {$dest_port} {$lbmode} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n"; + $conf .= " forward to <{$vs_a[$i]['poolname']}> port {$dest_port} {$lbmode} {$check_a[$pools[$vs_a[$i]['poolname']]['monitor']]} \n"; if (isset($vs_a[$i]['sitedown']) && strlen($vs_a[$i]['sitedown']) > 0) - $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$dest_port} {$lbmode} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n"; + $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$dest_port} {$lbmode} {$check_a[$pools[$vs_a[$i]['poolname']]['monitor']]} \n"; $conf .= "}\n"; } else { $conf .= "redirect \"{$name}\" {\n"; $conf .= " listen on {$ip} port {$src_port}\n"; - $conf .= " forward to <{$vs_a[$i]['pool']}> port {$dest_port} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n"; + $conf .= " forward to <{$vs_a[$i]['poolname']}> port {$dest_port} {$check_a[$pools[$vs_a[$i]['poolname']]['monitor']]} \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 {$dest_port} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n"; + $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$dest_port} {$check_a[$pools[$vs_a[$i]['poolname']]['monitor']]} \n"; $conf .= "}\n"; } |
