lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvpn: deflect a carp event ealier for servers

Browse Source 
If the server is running don't stop it.  If it is not running
go through the trouble of trying to start it.
This commit is contained in:
Franco Fichtner 2019-04-29 09:25:01 +02:00
parent a2c38b7c87
commit ecdf0404b7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/etc/inc/plugins.inc.d/openvpn.inc
View File

@ -981,20 +981,21 @@ function openvpn_restart($mode, $settings, $carp_event = false)
$vpnid = $settings['vpnid'];
$mode_id = $mode.$vpnid;
if ($carp_event && $mode == 'server' && isvalidpid("/var/run/openvpn_{$mode_id}.pid")) {
/* do not stop or restart a server if we are handling a CARP event */
return;
}
killbypid("/var/run/openvpn_{$mode_id}.pid", 'TERM', true);
if (isset($settings['disable'])) {
return;
}
if (strstr($settings['interface'], '_vip')) {
if ($mode == 'client' && get_carp_interface_status($settings['interface']) == gettext('BACKUP')) {
/* do not start a client if we are a CARP backup instance */
if (strstr($settings['interface'], '_vip') && $mode == 'client' &&
get_carp_interface_status($settings['interface']) == gettext('BACKUP')) {
/* do not restart a client if we are a CARP backup instance */
return;
} elseif ($mode == 'server' && $carp_event) {
/* do not start a server if we are handling a CARP event */
return;
}
}
@unlink("/var/etc/openvpn/{$mode_id}.sock");