Commit 660c671d authored by Franco Fichtner's avatar Franco Fichtner

plugins: vpn/newwanip configure spot change

parent bd29d862
...@@ -37,7 +37,7 @@ function dyndns_configure() ...@@ -37,7 +37,7 @@ function dyndns_configure()
return array( return array(
'bootup' => array('dyndns_configure_do'), 'bootup' => array('dyndns_configure_do'),
'local' => array('dyndns_configure_do'), 'local' => array('dyndns_configure_do'),
'interface' => array('dyndns_configure_do:2'), 'newwanip' => array('dyndns_configure_do:2'),
); );
} }
......
...@@ -114,7 +114,7 @@ $p2_pfskeygroups = array( ...@@ -114,7 +114,7 @@ $p2_pfskeygroups = array(
function ipsec_configure() function ipsec_configure()
{ {
return array( return array(
'interface' => array('ipsec_configure_do:2'), 'vpn' => array('ipsec_configure_do:2'),
); );
} }
......
...@@ -67,8 +67,8 @@ function ntpd_configure() ...@@ -67,8 +67,8 @@ function ntpd_configure()
{ {
return array( return array(
'bootup' => array('ntpd_configure_defer'), 'bootup' => array('ntpd_configure_defer'),
'interface' => array('ntpd_configure_defer'),
'local' => array('ntpd_configure_start'), 'local' => array('ntpd_configure_start'),
'newwanip' => array('ntpd_configure_defer'),
); );
} }
......
...@@ -34,7 +34,7 @@ function rfc2136_configure() ...@@ -34,7 +34,7 @@ function rfc2136_configure()
return array( return array(
'bootup' => array('rfc2136_configure_do'), 'bootup' => array('rfc2136_configure_do'),
'local' => array('rfc2136_configure_do'), 'local' => array('rfc2136_configure_do'),
'interface' => array('rfc2136_configure_do:2'), 'newwanip' => array('rfc2136_configure_do:2'),
); );
} }
......
...@@ -186,10 +186,8 @@ if (!is_ipaddr($oldip) || $curwanip != $oldip || !is_ipaddrv4($config['interface ...@@ -186,10 +186,8 @@ if (!is_ipaddr($oldip) || $curwanip != $oldip || !is_ipaddrv4($config['interface
openvpn_resync_all($interface); openvpn_resync_all($interface);
} }
/* reload plugins */ plugins_configure('vpn', false, array($interface));
plugins_configure('interface', false, array($interface)); plugins_configure('newwanip', false, array($interface));
/* reload graphing functions */
rrd_configure(); rrd_configure();
} }
......
...@@ -141,8 +141,6 @@ if (substr($interface_real, 0, 4) != 'ovpn') { ...@@ -141,8 +141,6 @@ if (substr($interface_real, 0, 4) != 'ovpn') {
openvpn_resync_all($interface); openvpn_resync_all($interface);
} }
/* reload plugins */ plugins_configure('vpn', false, array($interface));
plugins_configure('interface', false, array($interface)); plugins_configure('newwanip', false, array($interface));
/* reload graphing functions */
rrd_configure(); rrd_configure();
...@@ -521,8 +521,13 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -521,8 +521,13 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} }
} }
} }
/* restart plugins */
plugins_configure('interface'); /*
* XXX possibly wrong to configure interfaces through newwanip
* when the interface is dynamic and this gets called again...
*/
plugins_configure('newwanip');
/* sync filter configuration */ /* sync filter configuration */
setup_gateways_monitor(); setup_gateways_monitor();
filter_configure(); filter_configure();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment