diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-03-19 14:01:12 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-03-19 14:01:12 -0700 |
| commit | 3a887bd8e0098b128e741362d8d34c8b086999c4 (patch) | |
| tree | 99304488111a00e4e0733eb208261430e4020161 /templates | |
| parent | f5fed6af0dbe1c9123c3c230f5b950569fb4fdcb (diff) | |
| download | vyatta-cfg-vpn-3a887bd8e0098b128e741362d8d34c8b086999c4.tar.gz vyatta-cfg-vpn-3a887bd8e0098b128e741362d8d34c8b086999c4.zip | |
Replace old form (expression) in end: tag
Use shell syntax.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vpn/node.def | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/templates/vpn/node.def b/templates/vpn/node.def index d9aaa0c..60c5180 100644 --- a/templates/vpn/node.def +++ b/templates/vpn/node.def @@ -1,12 +1,8 @@ priority: 900 help: Configure Virtual Private Network (VPN) -end:expression: "sudo /opt/vyatta/sbin/vpn-config.pl \ - --config_file='/etc/ipsec.conf' \ +end:sudo /opt/vyatta/sbin/vpn-config.pl \ + --config_file='/etc/ipsec.conf' \ --secrets_file='/etc/ipsec.secrets' \ - --init_script='/etc/init.d/ipsec' && \ - if [ -x /opt/vyatta/sbin/vyatta-update-l2tp.pl ]; then \ - sudo /opt/vyatta/sbin/vyatta-update-l2tp.pl; \ - fi && \ - if [ -x /opt/vyatta/sbin/vyatta-update-pptp.pl ]; then \ - sudo /opt/vyatta/sbin/vyatta-update-pptp.pl; \ - fi" + --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 |