diff options
| author | hagbard <vyosdev@derith.de> | 2019-07-18 09:30:03 -0700 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2019-07-25 09:23:55 -0700 |
| commit | 4101e824f28d3a8c66d1730d222a4ba3d88b166d (patch) | |
| tree | ef76f4cf65253eb7d64a40d0cc4df0e944a7d441 | |
| parent | 7500490824d1675c62c152abc1ac49fe2324f62e (diff) | |
| download | vyatta-cfg-vpn-4101e824f28d3a8c66d1730d222a4ba3d88b166d.tar.gz vyatta-cfg-vpn-4101e824f28d3a8c66d1730d222a4ba3d88b166d.zip | |
[accel-l2tp] - T834: L2TP implementation
- disable legacy update-l2tp.pl
- ipsec-settings.py last entry to run after all the legacy scripts
| -rw-r--r-- | templates/vpn/node.def | 6 |
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 |