diff options
| author | jim-p <jimp@pfsense.org> | 2013-02-11 14:03:01 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-02-11 14:03:01 -0500 |
| commit | ef84458311f9e6edd2dfebf9f62db7729a3219df (patch) | |
| tree | d12c734b17fbfa27349c6291837628a1b750b0e5 /usr/local/www | |
| parent | b9f6677017bb21079675e1981ce0718014235318 (diff) | |
| download | pfsense-ef84458311f9e6edd2dfebf9f62db7729a3219df.zip pfsense-ef84458311f9e6edd2dfebf9f62db7729a3219df.tar.gz | |
Use the actual openvpn restart routine when starting/stopping from services rather than killing/restarting manually.
Diffstat (limited to 'usr/local/www')
| -rwxr-xr-x | usr/local/www/status_services.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/usr/local/www/status_services.php b/usr/local/www/status_services.php index 5061213..aa7f415 100755 --- a/usr/local/www/status_services.php +++ b/usr/local/www/status_services.php @@ -40,6 +40,7 @@ require_once("guiconfig.inc"); require_once("captiveportal.inc"); require_once("service-utils.inc"); +require_once("openvpn.inc"); require_once("ipsec.inc"); require_once("vpn.inc"); require_once("vslb.inc"); @@ -94,12 +95,8 @@ if($_GET['mode'] == "restartservice" and !empty($_GET['service'])) { if ($vpnmode == "server" || $vpnmode == "client") { $id = $_GET['id']; $configfile = "{$g['varetc_path']}/openvpn/{$vpnmode}{$id}.conf"; - $pidfile = $g['varrun_path'] . "/openvpn_{$vpnmode}{$id}.pid"; - if (file_exists($configfile)) { - killbypid($pidfile); - sleep(1); - mwexec_bg("/usr/local/sbin/openvpn --config {$configfile}"); - } + if (file_exists($configfile)) + openvpn_restart_by_vpnid($vpnmode, $id); } break; case 'relayd': @@ -146,7 +143,7 @@ if($_GET['mode'] == "startservice" and !empty($_GET['service'])) { $id = $_GET['id']; $configfile = "{$g['varetc_path']}/openvpn/{$vpnmode}{$id}.conf"; if (file_exists($configfile)) - mwexec_bg("/usr/local/sbin/openvpn --config {$configfile}"); + openvpn_restart_by_vpnid($vpnmode, $id); } break; case 'relayd': |
