diff options
author | Ermal <eri@pfsense.org> | 2013-12-02 21:12:31 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2013-12-02 21:12:31 +0000 |
commit | 77411fa70dcdd0bd7831b8f6d87187e8563200ef (patch) | |
tree | 58ad62bef6d6ca628bdd8dd52b3b64311871929c /etc/rc.carpmaster | |
parent | aa87cf1108532f083761a5d2da4ff518cc398356 (diff) | |
download | pfsense-77411fa70dcdd0bd7831b8f6d87187e8563200ef.zip pfsense-77411fa70dcdd0bd7831b8f6d87187e8563200ef.tar.gz |
Correct CARP events on devd and the argument processing on called scripts
Diffstat (limited to 'etc/rc.carpmaster')
-rwxr-xr-x | etc/rc.carpmaster | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/etc/rc.carpmaster b/etc/rc.carpmaster index 50db028..d4c122e 100755 --- a/etc/rc.carpmaster +++ b/etc/rc.carpmaster @@ -35,28 +35,37 @@ require_once("notices.inc"); require_once("openvpn.inc"); require_once("interfaces.inc"); -$notificationmsg = sprintf('Carp cluster member "%2$s (%1$s)" has resumed the state "MASTER"',$argv[1],convert_friendly_interface_to_friendly_descr($argv[1])); +$argument = str_replace("\n", "", $argv[1]); +if (!strstr($argument, "@")) + log_error("Carp MASTER event triggered from wrong source {$argument}"); + +list($vhid, $iface) = explode("@", $argument); + +$friendly = convert_real_interface_to_friendly_interface_name($iface); +$friendly_descr = convert_friendly_interface_to_friendly_descr($friendly); +$notificationmsg = sprintf('Carp cluster member "%2$s (%1$s)" has resumed the state "MASTER"', $argument, $friendly_descr); notify_via_smtp($notificationmsg); notify_via_growl($notificationmsg); +log_error($notificationmsg); /* Start OpenVPN clients running on this VIP, since they should be in the stopped state while the VIP is CARP Backup. */ global $config; if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-client'])) { foreach ($config['openvpn']['openvpn-client'] as $settings) { - if ($settings['interface'] == $argv[1]) { - log_error("Starting OpenVPN instance on {$settings['interface']} because of transition to CARP master."); + if ($settings['interface'] == $friendly) { + log_error("Starting OpenVPN client instance on {$friendly_descr} because of transition to CARP master."); openvpn_restart('client', $settings); } } } if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-server'])) { foreach ($config['openvpn']['openvpn-server'] as $settings) { - if ($settings['interface'] == $argv[1]) { - log_error("Starting OpenVPN instance on {$settings['interface']} because of transition to CARP master."); + if ($settings['interface'] == $friendly) { + log_error("Starting OpenVPN instance on {$friendly_descr} because of transition to CARP master."); openvpn_restart('server', $settings); } } } -?>
\ No newline at end of file +?> |