diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-08-20 00:21:19 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 00:21:19 +0700 |
| commit | 68b37220255fff247cc8796fee29070d2634707c (patch) | |
| tree | 577939e7191df5b0cbd6215853e3eba0f674e653 | |
| parent | e6648cebe1a19f3becf1553b45ec2b9337332e65 (diff) | |
| parent | 3b09d829a524dceee31c88f71e49ab93b1078961 (diff) | |
| download | vyatta-cfg-vpn-68b37220255fff247cc8796fee29070d2634707c.tar.gz vyatta-cfg-vpn-68b37220255fff247cc8796fee29070d2634707c.zip | |
Merge pull request #19 from runborg/current
T787: Make sure dmvpn config is generated after ipsec config.
| -rw-r--r-- | templates/vpn/node.def | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/vpn/node.def b/templates/vpn/node.def index 1daeede..bc3476a 100644 --- a/templates/vpn/node.def +++ b/templates/vpn/node.def @@ -2,13 +2,13 @@ priority: 900 help: Virtual Private Network (VPN) end: sudo ${vyos_conf_scripts_dir}/ipsec-settings.py || exit 1 sudo /opt/vyatta/sbin/vyatta-vti-config.pl || exit 1 + sudo /opt/vyatta/sbin/vpn-config.pl \ + --config_file='/etc/ipsec.conf' \ + --secrets_file='/etc/ipsec.secrets' \ + --init_script='/etc/init.d/ipsec' || exit 1 sudo /opt/vyatta/sbin/dmvpn-config.pl \ --config_file='/etc/swanctl/swanctl.conf' \ --init_script='/etc/init.d/ipsec' || exit 1 sudo /opt/vyatta/sbin/vyos-update-nhrp.pl --set_ipsec || exit 1 - sudo /opt/vyatta/sbin/vpn-config.pl \ - --config_file='/etc/ipsec.conf' \ - --secrets_file='/etc/ipsec.secrets' \ - --init_script='/etc/init.d/ipsec' || exit 1 sudo /opt/vyatta/sbin/vyatta-update-l2tp.pl || exit 1 sudo /opt/vyatta/sbin/vyatta-update-pptp.pl || exit 1 |