plugins: split vpn/newwanip configures

src/etc/inc/plugins.inc.d/dyndns.inc

@@ -37,7 +37,7 @@ function dyndns_configure()
     return array(
         'bootup' => array('dyndns_configure_do'),
         'local' => array('dyndns_configure_do'),
-        'interface' => array('dyndns_configure_do:2'),
+        'newwanip' => array('dyndns_configure_do:2'),
     );
 }
 

src/etc/inc/plugins.inc.d/ipsec.inc

@@ -114,7 +114,7 @@ $p2_pfskeygroups = array(
 function ipsec_configure()
 {
     return array(
-        'interface' => array('ipsec_configure_do:2'),
+        'vpn' => array('ipsec_configure_do:2'),
     );
 }
 

src/etc/inc/plugins.inc.d/ntpd.inc

@@ -67,8 +67,8 @@ function ntpd_configure()
 {
     return array(
         'bootup' => array('ntpd_configure_defer'),
-        'interface' => array('ntpd_configure_defer'),
         'local' => array('ntpd_configure_start'),
+        'newwanip' => array('ntpd_configure_defer'),
     );
 }
 

src/etc/inc/plugins.inc.d/openvpn.inc

@@ -33,8 +33,8 @@
 function openvpn_configure()
 {
     return array(
-        'interface' => array('openvpn_configure_do:2'),
         'remote' => array('openvpn_configure_do'),
+        'vpn' => array('openvpn_configure_do:2'),
     );
 }
 

src/etc/inc/plugins.inc.d/rfc2136.inc

@@ -34,7 +34,7 @@ function rfc2136_configure()
     return array(
         'bootup' => array('rfc2136_configure_do'),
         'local' => array('rfc2136_configure_do'),
-        'interface' => array('rfc2136_configure_do:2'),
+        'newwanip' => array('rfc2136_configure_do:2'),
     );
 }
 

src/etc/rc.newwanip

@@ -164,10 +164,8 @@ if (!is_ipaddr($oldip) || $curwanip != $oldip || !is_ipaddrv4($config['interface
         @file_put_contents("/var/db/{$interface}_cacheip", $curwanip);
     }
 
-    /* reload plugins */
-    plugins_configure('interface', false, array($interface));
-
-    /* reload graphing functions */
+    plugins_configure('vpn', false, array($interface));
+    plugins_configure('newwanip', false, array($interface));
     rrd_configure();
 }
 

src/etc/rc.newwanipv6

@@ -129,10 +129,8 @@ if (!is_ipaddr($oldipv6) || $curwanipv6 != $oldipv6 || !is_ipaddrv6($config['int
         @file_put_contents("/var/db/{$interface}_cacheipv6", $curwanipv6);
     }
 
-    /* reload plugins */
-    plugins_configure('interface', false, array($interface));
-
-    /* reload graphing functions */
+    plugins_configure('vpn', false, array($interface));
+    plugins_configure('newwanip', false, array($interface));
     rrd_configure();
 }
 

src/www/interfaces.php

@@ -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 */
             setup_gateways_monitor();
             filter_configure();