diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-10-16 17:46:27 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-10-16 17:46:27 -0400 |
| commit | 9c426e33fca62e0e6910005e03477acd1d3a6bef (patch) | |
| tree | c33dd3d6b5ffc9b84fdddc53eb919b55da4ca0f4 | |
| parent | a780bd6680388c60943196b6b53b6def2a70bf95 (diff) | |
| download | pfsense-9c426e33fca62e0e6910005e03477acd1d3a6bef.zip pfsense-9c426e33fca62e0e6910005e03477acd1d3a6bef.tar.gz | |
Do not write out <sitedown></sitedown> if the Fall Back Pool is set to none.. Simply unset() it.
| -rw-r--r-- | etc/inc/vslb.inc | 5 | ||||
| -rwxr-xr-x | usr/local/www/load_balancer_virtual_server_edit.php | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc index 0613524..a5cebcb 100644 --- a/etc/inc/vslb.inc +++ b/etc/inc/vslb.inc @@ -235,8 +235,9 @@ function relayd_configure() { $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"; # sitedown MUST use the same port as the primary pool - sucks, but it's a relayd thing - if (isset($vs_a[$i]['sitedown']) && $vs_a[$i]['sitedown'] != "") + 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; } @@ -246,7 +247,7 @@ function relayd_configure() { $conf .= " protocol \"{$vs_a[$i]['relay_protocol']}\"\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($vs_a[$i]['sitedown']) && $vs_a[$i]['sitedown'] != "") + 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; diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php index 6793f84..9dd65d6 100755 --- a/usr/local/www/load_balancer_virtual_server_edit.php +++ b/usr/local/www/load_balancer_virtual_server_edit.php @@ -109,12 +109,14 @@ if ($_POST) { update_if_changed("mode", $vsent['mode'], $_POST['mode']); update_if_changed("relay protocol", $vsent['relay_protocol'], $_POST['relay_protocol']); + if($_POST['sitedown'] == "") + unset($vsent['sitedown']); + if (isset($id) && $a_vs[$id]) $a_vs[$id] = $vsent; else $a_vs[] = $vsent; - if ($changecount > 0) { /* Mark virtual server dirty */ mark_subsystem_dirty('loadbalancer'); |
