openvpn: start later alongside IPsec

Matches previous, no apparent reason not to do this.
This commit is contained in:
Franco Fichtner 2017-12-20 00:43:13 +01:00
parent ed9005ada5
commit 83670156ce
2 changed files with 1 additions and 4 deletions

View File

@ -114,7 +114,6 @@ $p2_pfskeygroups = array(
function ipsec_configure()
{
return array(
'bootup' => array('ipsec_configure_do'), /* XXX until OpenVPN moves */
'vpn' => array('ipsec_configure_do:2'),
);
}

View File

@ -97,8 +97,6 @@ system_syslogd_start(true);
openvpn_prepare_all(true);
interfaces_configure(true);
/* XXX move to plugin 'vpn' hook below */
openvpn_configure_do(true);
system_resolvconf_generate(true);
filter_configure_sync(true);
@ -120,7 +118,7 @@ filter_configure_sync(true);
/* XXX components must generate their stuff on their own */
configd_run('template reload *');
/* XXX vpn call before other bootup */
plugins_configure('vpn', true);
plugins_configure('bootup', true);
rrd_configure(true);