From 4e0bd7c3e389526a889d43230784fc7efa3cfed7 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 28 Apr 2019 16:50:40 +0200 Subject: [PATCH] openvpn: allow "_vip" devices to reload as well --- src/etc/inc/plugins.inc.d/openvpn.inc | 2 +- src/etc/rc.syshook.d/carp/20-openvpn | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc index 4656d0fc9..df00ab4f0 100644 --- a/src/etc/inc/plugins.inc.d/openvpn.inc +++ b/src/etc/inc/plugins.inc.d/openvpn.inc @@ -1195,7 +1195,7 @@ function openvpn_configure_do($verbose = false, $interface = '', $device_only = if (!empty($interface)) { /* protect reload by ignoring unassociated devices */ $realif = get_real_interface($interface); - if (substr($realif, 0, 4) != 'ovpn') { + if (!strstr($realif, 'ovpn') && strstr($realif, '_vip')) { return; } diff --git a/src/etc/rc.syshook.d/carp/20-openvpn b/src/etc/rc.syshook.d/carp/20-openvpn index 89080d4a0..8d4640e69 100755 --- a/src/etc/rc.syshook.d/carp/20-openvpn +++ b/src/etc/rc.syshook.d/carp/20-openvpn @@ -49,8 +49,8 @@ list ($vhid, $iface) = explode('@', $subsystem); $friendly = convert_real_interface_to_friendly_interface_name($iface); $carp_iface = "{$friendly}_vip{$vhid}"; -$friendly_descr = convert_friendly_interface_to_friendly_descr($carp_iface); +$descr = convert_friendly_interface_to_friendly_descr($carp_iface); -log_error(sprintf('Carp cluster member "%s (%s)" has resumed the state "%s" for vhid %s', $friendly_descr, $subsystem, $type, $vhid)); +log_error(sprintf('Carp cluster member "%s (%s)" has resumed the state "%s" for vhid %s', $descr, $subsystem, $type, $vhid)); openvpn_configure_do(false, $carp_iface, true);