summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-12-05 14:37:21 +0100
committerGitHub <noreply@github.com>2019-12-05 14:37:21 +0100
commit006beada13e22929b7439a2123f0b434b666d4cc (patch)
tree9b54b955653ee82e89f6f411a7ac4c9745c5c505
parenta27ec88521929ebf4354ea09e84559ad41837da8 (diff)
parent69678925f5383f0087b0c764e272b6c2ff25f4bd (diff)
downloadvyatta-cfg-vpn-006beada13e22929b7439a2123f0b434b666d4cc.tar.gz
vyatta-cfg-vpn-006beada13e22929b7439a2123f0b434b666d4cc.zip
Merge pull request #27 from DmitriyEshenko/dmvpn
dmvpn: T1784: Run ipsec-settings before DMVPN
-rw-r--r--templates/vpn/node.def3
1 files changed, 1 insertions, 2 deletions
diff --git a/templates/vpn/node.def b/templates/vpn/node.def
index cfb0e64..311f59d 100644
--- a/templates/vpn/node.def
+++ b/templates/vpn/node.def
@@ -5,9 +5,8 @@ end: sudo /opt/vyatta/sbin/vyatta-vti-config.pl || exit 1
--config_file='/etc/ipsec.conf' \
--secrets_file='/etc/ipsec.secrets' \
--init_script='/etc/init.d/ipsec' || exit 1
+ sudo ${vyos_conf_scripts_dir}/ipsec-settings.py || 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 ${vyos_conf_scripts_dir}/ipsec-settings.py || exit 1
-# sudo /opt/vyatta/sbin/vyatta-update-l2tp.pl || exit 1