summaryrefslogtreecommitdiff
path: root/templates/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'templates/protocols')
-rw-r--r--templates/protocols/ospf/area/node.tag/authentication/node.def33
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def10
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def (renamed from templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/simple/node.def)4
3 files changed, 27 insertions, 20 deletions
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)