diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-02-04 13:23:38 -0600 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-02-04 13:23:38 -0600 |
| commit | 79545a5450097781fffe6ab138e42d1a30760aa0 (patch) | |
| tree | f61fc14b0b1c3cc5bb97475c2af784a32abe82cc /templates | |
| parent | af1c221bcc3b33a6d0d02fdb278500aa85c71a5e (diff) | |
| download | vyatta-cfg-vpn-79545a5450097781fffe6ab138e42d1a30760aa0.tar.gz vyatta-cfg-vpn-79545a5450097781fffe6ab138e42d1a30760aa0.zip | |
Move protocol out of local and remote nodes as it has to be the same
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/protocol/node.def (renamed from templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local/protocol/node.def) | 6 | ||||
| -rw-r--r-- | templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote/protocol/node.def | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local/protocol/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/protocol/node.def index 040a391..f684ec9 100644 --- a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local/protocol/node.def +++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/protocol/node.def @@ -9,3 +9,9 @@ syntax:expression: exec "if [ -n \"`/opt/vyatta/sbin/vyatta-validate-type.pl pro echo invalid protocol \"$VAR(@)\" ; \ exit 1 ; \ fi ; " +# Provide some help for command completion. +allowed: + protos=`cat /etc/protocols | sed -e '/^#.*/d' | awk '{ print $1 }' | grep -v 'v6'` + protos="all $protos tcp_udp" + echo -n $protos + diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote/protocol/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote/protocol/node.def deleted file mode 100644 index 040a391..0000000 --- a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote/protocol/node.def +++ /dev/null @@ -1,11 +0,0 @@ -type: txt - -help: Protocol to Encrypt - -val_help: txt ; IP protocol name from /etc/protocols (e.g. "gre" or "tcp") -val_help: u32:0-255 ; IP protocol number - -syntax:expression: exec "if [ -n \"`/opt/vyatta/sbin/vyatta-validate-type.pl protocol '$VAR(@)'`\" ]; then \ - echo invalid protocol \"$VAR(@)\" ; \ - exit 1 ; \ - fi ; " |