summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2019-08-19 11:59:11 -0400
committerDaniil Baturin <daniil@baturin.org>2019-08-19 11:59:11 -0400
commit4fa5187c66fe9b7375b6b3edd2d422706924d6e4 (patch)
treeec53013595dec7364218a03dd6e213e7b5060864
parent662278f70a1269873651ff175980b4acea76633a (diff)
parenta36a6c764bc7fb2d1f76179c13e0b6c7d9cf61a6 (diff)
downloadvyatta-cfg-vpn-4fa5187c66fe9b7375b6b3edd2d422706924d6e4.tar.gz
vyatta-cfg-vpn-4fa5187c66fe9b7375b6b3edd2d422706924d6e4.zip
Merge branch 'current' into equuleus
-rw-r--r--templates/vpn/node.def6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/vpn/node.def b/templates/vpn/node.def
index 59464bf..cfb0e64 100644
--- a/templates/vpn/node.def
+++ b/templates/vpn/node.def
@@ -1,7 +1,6 @@
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
+end: 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' \
@@ -10,4 +9,5 @@ end: sudo ${vyos_conf_scripts_dir}/ipsec-settings.py || exit 1
--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/vyatta-update-l2tp.pl || exit 1
+ sudo ${vyos_conf_scripts_dir}/ipsec-settings.py || exit 1
+# sudo /opt/vyatta/sbin/vyatta-update-l2tp.pl || exit 1