diff options
Diffstat (limited to 'templates')
18 files changed, 143 insertions, 79 deletions
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/simple/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def index a2a1ef7a..a55e38b0 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/simple/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -1,20 +1,23 @@ type: txt -help: Configure simple password +help: Configure plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ exit 1 ; \ fi ; " + update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " + delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"no ip ospf authentication-key \"; " + comp_help: possible completions: - <text> Simple password (8 characters or less) + <text> Plain text password (8 characters or less) diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def index cff270e2..5664aa46 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def @@ -4,7 +4,7 @@ syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal\" \ + -c \"configure terminal\" \ -c \"interface $VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/simple-password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def index af7a0a1f..bb6c0eeb 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/simple-password/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -1,9 +1,9 @@ type: txt -help: Simple password authentication key -syntax:expression: exec " \ - if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ +help: Plain text password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo Password must be 16 characters or less ; \ - exit 1 ; \ + exit 1 ; \ fi ; " update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ @@ -15,5 +15,6 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ -c \"no ip rip authentication mode\" \ -c \"no ip rip authentication string $VAR(@)\"; " + comp_help: possible completions: <text> Password (16 characters or less) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/simple/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index 987cdfe0..ac3c7b87 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/simple/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure simple password +help: Configure plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ @@ -20,4 +20,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"no ip ospf authentication-key \"; " comp_help: possible completions: - <text> Simple password (8 characters or less) + <text> Plain text password (8 characters or less) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/simple-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index fe3bbe16..2b9dac5b 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/simple-password/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Simple password authentication key +help: Plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ echo Password must be 16 characters or less ; \ @@ -19,4 +19,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"no ip rip authentication string $VAR(@) \"; " comp_help: possible completions: - <text> Password (16 characters or less) + <text> Plain text password (16 characters or less) diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def index 9e196ef7..673db1d1 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -2,21 +2,22 @@ tag: type: u32 help: Configure MD5 key id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" -commit:expression: $VAR(md5-key/) != ""; "must add the md5-key for key-id $VAR(@)" +commit:expression: $VAR(md5-key/) != ""; \ + "must add the md5-key for key-id $VAR(@)" + delete:expression: "touch /tmp/ospf-md5.$PPID" -end:expression: "if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"interface $VAR(../../../../../@) \" \ - -c \"no ip ospf message-digest-key $VAR(@)\"; \ - rm /tmp/ospf-md5.$PPID; \ - else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"interface $VAR(../../../../../@) \" \ + +end:expression: "\ + if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../@) \" \ + -c \"no ip ospf message-digest-key $VAR(@)\"; \ + rm /tmp/ospf-md5.$PPID; \ + else \ + ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + -c \"interface $VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " - - - - - +comp_help: possible completions: + <1-255> Set the key id diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def index 3efdfdd3..7cbcad83 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def @@ -1,2 +1,9 @@ type: txt help: Configure md5 key +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo MD5 key must be 16 characters or less ; \ + exit 1 ; \ + fi ; " +comp_help: possible completions: + <text> MD5 Key (16 characters or less) diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def index ca2e9a86..0f0f0134 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def @@ -1,10 +1,12 @@ help: Configure MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"interface $VAR(../../../../@) \" \ - -c \"no ip ospf authentication \" \ - -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"interface $VAR(../../../../@) \" \ - -c \"no ip ospf authentication \"; " +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"ip ospf authentication message-digest\"; " +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def new file mode 100644 index 00000000..92dc817f --- /dev/null +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -0,0 +1,23 @@ +type: txt +help: Configure plain text password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ + echo Password must be 8 characters or less ; \ + exit 1 ; \ + fi ; " + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"ip ospf authentication \" \ + -c \"ip ospf authentication-key $VAR(@) \"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"interface $VAR(../../../../@) \" \ + -c \"no ip ospf authentication \" \ + -c \"no ip ospf authentication-key \"; " + +comp_help: possible completions: + <text> Plain text password (8 characters or less) diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/simple/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/simple/node.def deleted file mode 100644 index 4a8f5729..00000000 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/simple/node.def +++ /dev/null @@ -1,12 +0,0 @@ -type: txt -help: Configure simple password -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"interface $VAR(../../../../@) \" \ - -c \"no ip ospf authentication \" \ - -c \"ip ospf authentication \" \ - -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"interface $VAR(../../../../@) \" \ - -c \"no ip ospf authentication \" \ - -c \"no ip ospf authentication-key \"; " - diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index 97f7b8df..c07b459b 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -1,8 +1,23 @@ type: txt help: Authentication password -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ - -c \"ip rip authentication mode md5\" -c \"ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ - -c \"key chain $VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" -c \"key-string $VAR(@)\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ - -c \"no ip rip authentication mode md5\" -c \"no ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ - -c \"no key chain $VAR(../../../../../@)-rip\" " +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo MD5 key must be 16 characters or less ; \ + exit 1 ; \ + fi ; " + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ + -c \"ip rip authentication mode md5\" \ + -c \"ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ + -c \"key chain $VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \ + -c \"key-string $VAR(@)\" " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ + -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ + -c \"no ip rip authentication mode md5\" \ + -c \"no ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ + -c \"no key chain $VAR(../../../../../@)-rip\" " + +comp_help: possible completions: + <text> MD5 Key (16 characters or less) diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def new file mode 100644 index 00000000..bb6c0eeb --- /dev/null +++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -0,0 +1,20 @@ +type: txt +help: Plain text password +syntax:expression: exec " \ + if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \ + echo Password must be 16 characters or less ; \ + exit 1 ; \ + fi ; " + +update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ + -c \"ip rip authentication mode text\" \ + -c \"ip rip authentication string $VAR(@)\"; " + +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ + -c \"no ip rip authentication mode\" \ + -c \"no ip rip authentication string $VAR(@)\"; " + +comp_help: possible completions: + <text> Password (16 characters or less) diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/simple-password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/simple-password/node.def deleted file mode 100644 index 82cbc16e..00000000 --- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/simple-password/node.def +++ /dev/null @@ -1,6 +0,0 @@ -type: txt -help: Simple password authentication key -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ - -c \"ip rip authentication mode text\" -c \"ip rip authentication string $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \ - -c \"no ip rip authentication mode\" -c \"no ip rip authentication string $VAR(@)\"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/simple/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def index a2a1ef7a..a55e38b0 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/simple/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -1,20 +1,23 @@ type: txt -help: Configure simple password +help: Configure plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ exit 1 ; \ fi ; " + update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " + delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"no ip ospf authentication-key \"; " + comp_help: possible completions: - <text> Simple password (8 characters or less) + <text> Plain text password (8 characters or less) diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def index cff270e2..5664aa46 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def @@ -4,7 +4,7 @@ syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal\" \ + -c \"configure terminal\" \ -c \"interface $VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def index b5d7bbac..66bd28d3 100644 --- a/templates/protocols/ospf/area/node.tag/authentication/node.def +++ b/templates/protocols/ospf/area/node.tag/authentication/node.def @@ -1,20 +1,27 @@ type: txt help: Configure OSPF area authentication type -syntax:expression: $VAR(@) in "simple", "md5"; "Must be either simple or md5" -update:expression: "if [ x$VAR(@) == xsimple ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"router ospf \" \ - -c \"no area $VAR(../@) authentication \" \ - -c \"area $VAR(../@) authentication \" ; \ - else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"router ospf \" \ - -c \"no area $VAR(../@) authentication \" \ - -c \"area $VAR(../@) authentication message-digest\" ; \ +syntax:expression: $VAR(@) in "plaintext-password", "md5"; \ + "Must be either plaintext-password or md5" + +update:expression: "\ + if [ x$VAR(@) == xplaintext-password ]; then \ + ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"router ospf \" \ + -c \"no area $VAR(../@) authentication \" \ + -c \"area $VAR(../@) authentication \" ; \ + else \ + ${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"router ospf \" \ + -c \"no area $VAR(../@) authentication \" \ + -c \"area $VAR(../@) authentication message-digest\" ; \ fi; " + delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ -c \"router ospf \" \ -c \"no area $VAR(../@) authentication \" " + comp_help: possible completions: - simple Use simple plain-text authentication - md5 Use md5 authentication + plaintex-password Use plain-text authentication + md5 Use md5 authentication diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def index ec24b76b..c2af0dd3 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def @@ -3,12 +3,12 @@ create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no area $VAR(../../../@) virtual-link $VAR(../../@) \ - authentication-key\" \ + authentication-key\" \ -c \"area $VAR(../../../@) virtual-link $VAR(../../@) \ authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ - -c \"configure terminal\" \ - -c \"router ospf\" \ - -c \"area $VAR(../../../@) virtual-link $VAR(../../@) \ +delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ + -c \"configure terminal\" \ + -c \"router ospf\" \ + -c \"area $VAR(../../../@) virtual-link $VAR(../../@) \ authentication null\"; " diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/simple/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def index ab694398..ab268f98 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/simple/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure simple password +help: Configure plain text password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ @@ -17,4 +17,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ authentication authentication-key \"; " comp_help: possible completions: - <text> Simple password (8 characters or less) + <text> Plain text password (8 characters or less) |