diff options
| author | jim-p <jimp@pfsense.org> | 2011-09-28 11:38:05 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-09-28 11:40:21 -0400 |
| commit | 240ffd2e7e748f0074d572756cd40bb272b29451 (patch) | |
| tree | dedc9a0a20c7dc293799640ef2da8add7d1b363c /usr | |
| parent | e3522ebf9579aa35f269fffb7e90b3c8f5adb091 (diff) | |
| download | pfsense-240ffd2e7e748f0074d572756cd40bb272b29451.zip pfsense-240ffd2e7e748f0074d572756cd40bb272b29451.tar.gz | |
Add relayd to Status > Services and widget. Add capability to kill when restarting instead of a simple reload. Implements #1913
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/status_services.php | 17 | ||||
| -rw-r--r-- | usr/local/www/widgets/widgets/services_status.widget.php | 7 |
2 files changed, 24 insertions, 0 deletions
diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php index 2303054..5061213 100755 --- a/usr/local/www/status_services.php +++ b/usr/local/www/status_services.php @@ -42,6 +42,7 @@ require_once("captiveportal.inc"); require_once("service-utils.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); +require_once("vslb.inc"); function gentitle_pkg($pgname) { global $config; @@ -101,6 +102,9 @@ if($_GET['mode'] == "restartservice" and !empty($_GET['service'])) { } } break; + case 'relayd': + relayd_configure(true); + break; default: restart_service($_GET['service']); break; @@ -145,6 +149,9 @@ if($_GET['mode'] == "startservice" and !empty($_GET['service'])) { mwexec_bg("/usr/local/sbin/openvpn --config {$configfile}"); } break; + case 'relayd': + relayd_configure(); + break; default: start_service($_GET['service']); break; @@ -201,6 +208,9 @@ if($_GET['mode'] == "stopservice" && !empty($_GET['service'])) { killbypid($pidfile); } break; + case 'relayd': + mwexec('pkill relayd'); + break; default: stop_service($_GET['service']); break; @@ -337,6 +347,13 @@ foreach (array('server', 'client') as $mode) { } } +if (count($config['load_balancer']['virtual_server']) && count($config['load_balancer']['lbpool'])) { + $pconfig = array(); + $pconfig['name'] = "relayd"; + $pconfig['description'] = gettext("Server load balancing daemon"); + $services[] = $pconfig; +} + function service_name_compare($a, $b) { if (strtolower($a['name']) == strtolower($b['name'])) return 0; diff --git a/usr/local/www/widgets/widgets/services_status.widget.php b/usr/local/www/widgets/widgets/services_status.widget.php index f41e7f5..054c7f6 100644 --- a/usr/local/www/widgets/widgets/services_status.widget.php +++ b/usr/local/www/widgets/widgets/services_status.widget.php @@ -152,6 +152,13 @@ foreach (array('server', 'client') as $mode) { } } +if (count($config['load_balancer']['virtual_server']) && count($config['load_balancer']['lbpool'])) { + $pconfig = array(); + $pconfig['name'] = "relayd"; + $pconfig['description'] = gettext("Server load balancing daemon"); + $services[] = $pconfig; +} + if(isset($_POST['servicestatusfilter'])) { $config['widgets']['servicestatusfilter'] = $_POST['servicestatusfilter']; write_config("Saved Service Status Filter via Dashboard"); |
