summaryrefslogtreecommitdiffstats
path: root/src/etc/inc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-01-04 16:44:41 -0200
committerRenato Botelho <renato@netgate.com>2016-01-05 09:08:10 -0200
commitcd41643dcd52e5a5aacba5a3c0165fbf9b5bb0fd (patch)
tree80ab61a1c3ce687b1b8d17632bb3bffee21d0188 /src/etc/inc
parent40880eec35b7def4efd2a3ce3779cb42c318ea8a (diff)
downloadpfsense-cd41643dcd52e5a5aacba5a3c0165fbf9b5bb0fd.zip
pfsense-cd41643dcd52e5a5aacba5a3c0165fbf9b5bb0fd.tar.gz
Rename pid files from lighty to nginx
Diffstat (limited to 'src/etc/inc')
-rw-r--r--src/etc/inc/service-utils.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/etc/inc/service-utils.inc b/src/etc/inc/service-utils.inc
index ca72d5f..ea4b0c5 100644
--- a/src/etc/inc/service-utils.inc
+++ b/src/etc/inc/service-utils.inc
@@ -439,9 +439,9 @@ function get_service_status($service) {
$running = is_pid_running("{$g['varrun_path']}/openvpn_{$service['mode']}{$service['vpnid']}.pid");
break;
case "captiveportal":
- $running = is_pid_running("{$g['varrun_path']}/lighty-{$service['zone']}-CaptivePortal.pid");
+ $running = is_pid_running("{$g['varrun_path']}/nginx-{$service['zone']}-CaptivePortal.pid");
if (isset($config['captiveportal'][$service['zone']]['httpslogin'])) {
- $running = $running && is_pid_running("{$g['varrun_path']}/lighty-{$service['zone']}-CaptivePortal-SSL.pid");
+ $running = $running && is_pid_running("{$g['varrun_path']}/nginx-{$service['zone']}-CaptivePortal-SSL.pid");
}
break;
case "vhosts-http":
@@ -665,8 +665,8 @@ function service_control_stop($name, $extras) {
break;
case 'captiveportal':
$zone = htmlspecialchars($extras['zone']);
- killbypid("{$g['varrun_path']}/lighty-{$zone}-CaptivePortal.pid");
- killbypid("{$g['varrun_path']}/lighty-{$zone}-CaptivePortal-SSL.pid");
+ killbypid("{$g['varrun_path']}/nginx-{$zone}-CaptivePortal.pid");
+ killbypid("{$g['varrun_path']}/nginx-{$zone}-CaptivePortal-SSL.pid");
break;
case 'ntpd':
killbyname("ntpd");
@@ -736,8 +736,8 @@ function service_control_restart($name, $extras) {
break;
case 'captiveportal':
$zone = htmlspecialchars($extras['zone']);
- killbypid("{$g['varrun_path']}/lighty-{$zone}-CaptivePortal.pid");
- killbypid("{$g['varrun_path']}/lighty-{$zone}-CaptivePortal-SSL.pid");
+ killbypid("{$g['varrun_path']}/nginx-{$zone}-CaptivePortal.pid");
+ killbypid("{$g['varrun_path']}/nginx-{$zone}-CaptivePortal-SSL.pid");
captiveportal_init_webgui_zonename($zone);
break;
case 'ntpd':
OpenPOWER on IntegriCloud