diff options
| author | Bill Marquette <billm@pfsense.org> | 2008-07-07 04:06:35 +0000 |
|---|---|---|
| committer | Bill Marquette <billm@pfsense.org> | 2008-07-07 04:06:35 +0000 |
| commit | 651d99c50218ae2c3d0089ffdf2223ddb959fc1b (patch) | |
| tree | 415186052a67b9e915ce2fcbb15895e7aeba5476 /etc | |
| parent | 7a4e37e10c1af790fedc24e5b994e52030a6afd8 (diff) | |
| download | pfsense-651d99c50218ae2c3d0089ffdf2223ddb959fc1b.zip pfsense-651d99c50218ae2c3d0089ffdf2223ddb959fc1b.tar.gz | |
allow relayd to actually restart
sitedown isn't required, but may still be set to nothing, don't write out
a bogus config line in this situation
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/vslb.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/vslb.inc b/etc/inc/vslb.inc index 05dfa86..9bf5d7d 100644 --- a/etc/inc/vslb.inc +++ b/etc/inc/vslb.inc @@ -65,7 +65,7 @@ function relayd_configure() { $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 tcp\n"; /* XXX - this needs to use the backup pool aka sitedown - but that isn't converted yet */ - if (isset($vs_a[$i]['sitedown'])) + if (isset($vs_a[$i]['sitedown']) && $vs_a[$i]['sitedown'] != "") $conf .= " forward to <{$vs_a[$i]['sitedown']}> port {$pools[$vs_a[$i]['pool']]['port']} check tcp\n"; $conf .= "}\n"; } @@ -73,7 +73,7 @@ function relayd_configure() { fwrite($fd, $conf); fclose($fd); - if (is_process_running('/usr/local/sbin/relayd')) { + if (is_process_running('relayd: parent')) { /* * XXX: Something breaks our control connection with relayd and makes relayctl stop working * rule reloads are the current suspect @@ -85,4 +85,4 @@ function relayd_configure() { } -?>
\ No newline at end of file +?> |
