diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-12-30 22:02:15 -0600 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-05 09:08:10 -0200 |
| commit | 4877ae1e5fff7d1460755c12dc9022da4a239f92 (patch) | |
| tree | a285fa735fd273f74d0cab4c0b2a1810e17df84c /src/etc/inc/captiveportal.inc | |
| parent | c4a278f2acd1b4df900eb6d6901a3d425887ec00 (diff) | |
| download | pfsense-4877ae1e5fff7d1460755c12dc9022da4a239f92.zip pfsense-4877ae1e5fff7d1460755c12dc9022da4a239f92.tar.gz | |
start converting CP to nginx
Diffstat (limited to 'src/etc/inc/captiveportal.inc')
| -rw-r--r-- | src/etc/inc/captiveportal.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc index 53e6034..5602785 100644 --- a/src/etc/inc/captiveportal.inc +++ b/src/etc/inc/captiveportal.inc @@ -311,8 +311,8 @@ EOD; captiveportal_write_elements(); /* kill any running mini_httpd */ - killbypid("{$g['varrun_path']}/lighty-{$cpzone}-CaptivePortal.pid"); - killbypid("{$g['varrun_path']}/lighty-{$cpzone}-CaptivePortal-SSL.pid"); + killbypid("{$g['varrun_path']}/nginx-{$cpzone}-CaptivePortal.pid"); + killbypid("{$g['varrun_path']}/nginx-{$cpzone}-CaptivePortal-SSL.pid"); /* start up the webserving daemon */ captiveportal_init_webgui_zone($cpcfg); @@ -337,8 +337,8 @@ EOD; } } else { - killbypid("{$g['varrun_path']}/lighty-{$cpzone}-CaptivePortal.pid"); - killbypid("{$g['varrun_path']}/lighty-{$cpzone}-CaptivePortal-SSL.pid"); + killbypid("{$g['varrun_path']}/nginx-{$cpzone}-CaptivePortal.pid"); + killbypid("{$g['varrun_path']}/nginx-{$cpzone}-CaptivePortal-SSL.pid"); killbypid("{$g['varrun_path']}/cp_prunedb_{$cpzone}.pid"); @unlink("{$g['varetc_path']}/captiveportal_{$cpzone}.html"); @unlink("{$g['varetc_path']}/captiveportal-{$cpzone}-error.html"); @@ -440,7 +440,7 @@ function captiveportal_init_webgui_zone($cpcfg) { @unlink("{$g['varrun']}/nginx-{$cpzone}-CaptivePortal.pid"); /* attempt to start nginx */ - $res = mwexec("/usr/local/sbin/nginx -c {$g['varetc_path']}/lighty-{$cpzone}-CaptivePortal.conf"); + $res = mwexec("/usr/local/sbin/nginx -c {$g['varetc_path']}/nginx-{$cpzone}-CaptivePortal.conf"); /* fire up https instance */ if (isset($cpcfg['httpslogin'])) { |
