From e150f133e0b982acf67310e926bf10c143838f39 Mon Sep 17 00:00:00 2001 From: Michael Larson Date: Fri, 1 Feb 2008 11:59:03 -0800 Subject: fixed up node.def files as per an-cheng's changes. more pkg stuff for the init script. added default values. --- configure.ac | 3 ++- debian/vyatta-wanloadbalance.postinst | 3 +++ .../templates/load-balancing/wan/interface-health/node.def | 2 +- .../wan/interface-health/node.tag/failure-count/node.def | 9 +++++---- .../load-balancing/wan/interface-health/node.tag/ping/node.def | 2 +- .../wan/interface-health/node.tag/resp-time/node.def | 9 +++++---- .../wan/interface-health/node.tag/success-count/node.def | 9 +++++---- .../share/vyatta-cfg/templates/load-balancing/wan/rule/node.def | 2 +- .../wan/rule/node.tag/destination/address/node.def | 2 +- .../wan/rule/node.tag/destination/network/node.def | 2 +- .../wan/rule/node.tag/destination/port-name/node.def | 2 +- .../wan/rule/node.tag/destination/port-number/node.def | 8 ++++---- .../load-balancing/wan/rule/node.tag/interface/node.def | 2 +- .../wan/rule/node.tag/interface/node.tag/weight/node.def | 8 ++++---- .../load-balancing/wan/rule/node.tag/source/address/node.def | 2 +- .../load-balancing/wan/rule/node.tag/source/network/node.def | 2 +- .../load-balancing/wan/rule/node.tag/source/port-name/node.def | 2 +- .../load-balancing/wan/rule/node.tag/source/port-number/node.def | 8 ++++---- scripts/vyatta-wanloadbalance.init | 0 templates/load-balancing/wan/interface-health/node.def | 2 +- .../wan/interface-health/node.tag/failure-count/node.def | 9 +++++---- .../load-balancing/wan/interface-health/node.tag/ping/node.def | 2 +- .../wan/interface-health/node.tag/resp-time/node.def | 9 +++++---- .../wan/interface-health/node.tag/success-count/node.def | 9 +++++---- templates/load-balancing/wan/node.def | 4 ++-- templates/load-balancing/wan/rule/node.def | 2 +- .../wan/rule/node.tag/destination/address/node.def | 2 +- .../wan/rule/node.tag/destination/network/node.def | 2 +- templates/load-balancing/wan/rule/node.tag/destination/node.def | 2 +- .../wan/rule/node.tag/destination/port-name/node.def | 2 +- .../wan/rule/node.tag/destination/port-number/node.def | 8 ++++---- templates/load-balancing/wan/rule/node.tag/interface/node.def | 2 +- .../wan/rule/node.tag/interface/node.tag/weight/node.def | 8 ++++---- templates/load-balancing/wan/rule/node.tag/protocol/node.def | 2 +- .../load-balancing/wan/rule/node.tag/source/address/node.def | 2 +- .../load-balancing/wan/rule/node.tag/source/network/node.def | 2 +- templates/load-balancing/wan/rule/node.tag/source/node.def | 2 +- .../load-balancing/wan/rule/node.tag/source/port-name/node.def | 2 +- .../load-balancing/wan/rule/node.tag/source/port-number/node.def | 8 ++++---- 39 files changed, 84 insertions(+), 74 deletions(-) mode change 100755 => 100644 scripts/vyatta-wanloadbalance.init diff --git a/configure.ac b/configure.ac index 38b00d0..ab2bacf 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,8 @@ AC_ARG_ENABLE([nostrip], AC_CONFIG_FILES( [Makefile] [debian/vyatta-wanloadbalance.postinst] - [debian/vyatta-wanloadbalance.postrm]) + [debian/vyatta-wanloadbalance.postrm] + [scripts/vyatta-wanloadbalance.init]) AC_SUBST(NOSTRIP) diff --git a/debian/vyatta-wanloadbalance.postinst b/debian/vyatta-wanloadbalance.postinst index 60763b4..03bc3ef 100644 --- a/debian/vyatta-wanloadbalance.postinst +++ b/debian/vyatta-wanloadbalance.postinst @@ -9,4 +9,7 @@ sysconfdir=${prefix}/etc mkdir -p $LOADBALANCE_DIR chmod 0755 $LOADBALANCE_DIR +rm -f /etc/init.d/vyatta-wanloadbalance 2>/dev/null +ln -s /opt/vyatta/sbin/vyatta-wanloadbalance.init /etc/init.d/vyatta-wanloadbalance 2>/dev/null + #nothing diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.def index 254fc98..8036627 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.def @@ -1,4 +1,4 @@ tag: type: txt -help: "Interface name" +help: Interface name diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def index 6c5179c..a37cab1 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def @@ -1,5 +1,6 @@ type: u32 -syntax: $(@) >= 0 && $(@) <= 10; "failure count must be between 1-10" -help: "Failure count" -#comp_help: possible completions: -#<1-10> Set Failure count +default: 1 +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 10; "failure count must be between 1-10" +help: Failure count +comp_help: possible completions: +<1-10> Set Failure count diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/ping/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/ping/node.def index 3240cb2..96338f4 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/ping/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/ping/node.def @@ -1,2 +1,2 @@ type: txt -help: "health test destination" +help: health test destination diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def index c7a44a0..0611ecf 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def @@ -1,5 +1,6 @@ type: u32 -syntax: $(@) >= 0 && $(@) <= 30; "response must be between 1 and 30 seconds" -help: "Ping Response Time (seconds)" -#comp_help: possible completions: -#<1-30> Set Response time (seconds) +default: 5 +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 30; "response must be between 1 and 30 seconds" +help: Ping Response Time (seconds) +comp_help: possible completions: +<1-30> Set Response time (seconds) diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def index f5ed6e3..63b045d 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def @@ -1,6 +1,7 @@ type: u32 -syntax: $(@) >= 0 && $(@) <= 10; "success count must be between 1 and 10" -help: "Success count" -#comp_help: possible completions: -#<1-10> Set Success count +default: 1 +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 10; "success count must be between 1 and 10" +help: Success count +comp_help: possible completions: +<1-10> Set Success count diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.def index f61b10c..84b3ad3 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "Rule number" +help: Rule number diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/address/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/address/node.def index 21c2670..45b133b 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/address/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/address/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: "IPv4 address" +help: IPv4 address diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/network/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/network/node.def index dd0c650..e742281 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/network/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/network/node.def @@ -1,2 +1,2 @@ type: ipv4net -help: "IPv4 Network address" +help: IPv4 Network address diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def index 71558ec..fbc6446 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "Port name" +help: Port name diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def index d0240c0..72cb512 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def @@ -1,7 +1,7 @@ tag: type: u32 -syntax: $(@) >= 0 && $(@) <= 65535; "port number must be between 1 and 65535" -help: "Port number" -#comp_help: possible completions: -#<1-65535> Port number +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 65535; "port number must be between 1 and 65535" +help: Port number +comp_help: possible completions: +<1-65535> Port number diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/interface/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/interface/node.def index 976bbf0..2c5a8a1 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/interface/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/interface/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "Interface name" +help: Interface name diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/interface/node.tag/weight/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/interface/node.tag/weight/node.def index dfac785..0cad14d 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/interface/node.tag/weight/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/interface/node.tag/weight/node.def @@ -1,5 +1,5 @@ type: u32 -syntax: $(@) >= 0 && $(@) <= 255; "Interface weight must be between 1 and 255" -help: "Load-balance weight" -#comp_help: possible completions: -#<1-255> Set Interface weight +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Interface weight must be between 1 and 255" +help: Load-balance weight +comp_help: possible completions: +<1-255> Set Interface weight diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/address/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/address/node.def index 21c2670..45b133b 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/address/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/address/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: "IPv4 address" +help: IPv4 address diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/network/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/network/node.def index 8d1a64d..b88ec3d 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/network/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/network/node.def @@ -1,2 +1,2 @@ type: ipv4net -help: "IPv4 network address" +help: IPv4 network address diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def index 862c5a0..6f8bcf5 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "port name" +help: port name diff --git a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def index 1788b21..599a4c6 100644 --- a/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def +++ b/debian/vyatta-wanloadbalance/opt/vyatta/share/vyatta-cfg/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def @@ -1,6 +1,6 @@ tag: type: u32 -syntax: $(@) >= 0 && $(@) <= 65535; "port number must be between 1 and 65535" -help: "port number" -#comp_help: possible completions: -#<1-65535> Port number +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 65535; "port number must be between 1 and 65535" +help: port number +comp_help: possible completions: +<1-65535> Port number diff --git a/scripts/vyatta-wanloadbalance.init b/scripts/vyatta-wanloadbalance.init old mode 100755 new mode 100644 diff --git a/templates/load-balancing/wan/interface-health/node.def b/templates/load-balancing/wan/interface-health/node.def index 254fc98..8036627 100644 --- a/templates/load-balancing/wan/interface-health/node.def +++ b/templates/load-balancing/wan/interface-health/node.def @@ -1,4 +1,4 @@ tag: type: txt -help: "Interface name" +help: Interface name diff --git a/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def b/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def index 6c5179c..a37cab1 100644 --- a/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def +++ b/templates/load-balancing/wan/interface-health/node.tag/failure-count/node.def @@ -1,5 +1,6 @@ type: u32 -syntax: $(@) >= 0 && $(@) <= 10; "failure count must be between 1-10" -help: "Failure count" -#comp_help: possible completions: -#<1-10> Set Failure count +default: 1 +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 10; "failure count must be between 1-10" +help: Failure count +comp_help: possible completions: +<1-10> Set Failure count diff --git a/templates/load-balancing/wan/interface-health/node.tag/ping/node.def b/templates/load-balancing/wan/interface-health/node.tag/ping/node.def index 3240cb2..96338f4 100644 --- a/templates/load-balancing/wan/interface-health/node.tag/ping/node.def +++ b/templates/load-balancing/wan/interface-health/node.tag/ping/node.def @@ -1,2 +1,2 @@ type: txt -help: "health test destination" +help: health test destination diff --git a/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def b/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def index c7a44a0..0611ecf 100644 --- a/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def +++ b/templates/load-balancing/wan/interface-health/node.tag/resp-time/node.def @@ -1,5 +1,6 @@ type: u32 -syntax: $(@) >= 0 && $(@) <= 30; "response must be between 1 and 30 seconds" -help: "Ping Response Time (seconds)" -#comp_help: possible completions: -#<1-30> Set Response time (seconds) +default: 5 +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 30; "response must be between 1 and 30 seconds" +help: Ping Response Time (seconds) +comp_help: possible completions: +<1-30> Set Response time (seconds) diff --git a/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def b/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def index f5ed6e3..63b045d 100644 --- a/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def +++ b/templates/load-balancing/wan/interface-health/node.tag/success-count/node.def @@ -1,6 +1,7 @@ type: u32 -syntax: $(@) >= 0 && $(@) <= 10; "success count must be between 1 and 10" -help: "Success count" -#comp_help: possible completions: -#<1-10> Set Success count +default: 1 +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 10; "success count must be between 1 and 10" +help: Success count +comp_help: possible completions: +<1-10> Set Success count diff --git a/templates/load-balancing/wan/node.def b/templates/load-balancing/wan/node.def index f52fa29..1b970b7 100644 --- a/templates/load-balancing/wan/node.def +++ b/templates/load-balancing/wan/node.def @@ -1,4 +1,4 @@ -help: "wan load-balance configuration" -commit: exec "\\${vyatta_sbindir}/vyatta-wanloadbalance.pl" +help: wan load-balance configuration +commit:expression: exec "${vyatta_sbindir}/vyatta-wanloadbalance.pl" diff --git a/templates/load-balancing/wan/rule/node.def b/templates/load-balancing/wan/rule/node.def index f61b10c..84b3ad3 100644 --- a/templates/load-balancing/wan/rule/node.def +++ b/templates/load-balancing/wan/rule/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "Rule number" +help: Rule number diff --git a/templates/load-balancing/wan/rule/node.tag/destination/address/node.def b/templates/load-balancing/wan/rule/node.tag/destination/address/node.def index 21c2670..45b133b 100644 --- a/templates/load-balancing/wan/rule/node.tag/destination/address/node.def +++ b/templates/load-balancing/wan/rule/node.tag/destination/address/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: "IPv4 address" +help: IPv4 address diff --git a/templates/load-balancing/wan/rule/node.tag/destination/network/node.def b/templates/load-balancing/wan/rule/node.tag/destination/network/node.def index dd0c650..e742281 100644 --- a/templates/load-balancing/wan/rule/node.tag/destination/network/node.def +++ b/templates/load-balancing/wan/rule/node.tag/destination/network/node.def @@ -1,2 +1,2 @@ type: ipv4net -help: "IPv4 Network address" +help: IPv4 Network address diff --git a/templates/load-balancing/wan/rule/node.tag/destination/node.def b/templates/load-balancing/wan/rule/node.tag/destination/node.def index 8a14694..ebdd65f 100644 --- a/templates/load-balancing/wan/rule/node.tag/destination/node.def +++ b/templates/load-balancing/wan/rule/node.tag/destination/node.def @@ -1 +1 @@ -help: "destination" +help: destination diff --git a/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def b/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def index 71558ec..fbc6446 100644 --- a/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def +++ b/templates/load-balancing/wan/rule/node.tag/destination/port-name/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "Port name" +help: Port name diff --git a/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def b/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def index d0240c0..72cb512 100644 --- a/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def +++ b/templates/load-balancing/wan/rule/node.tag/destination/port-number/node.def @@ -1,7 +1,7 @@ tag: type: u32 -syntax: $(@) >= 0 && $(@) <= 65535; "port number must be between 1 and 65535" -help: "Port number" -#comp_help: possible completions: -#<1-65535> Port number +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 65535; "port number must be between 1 and 65535" +help: Port number +comp_help: possible completions: +<1-65535> Port number diff --git a/templates/load-balancing/wan/rule/node.tag/interface/node.def b/templates/load-balancing/wan/rule/node.tag/interface/node.def index 976bbf0..2c5a8a1 100644 --- a/templates/load-balancing/wan/rule/node.tag/interface/node.def +++ b/templates/load-balancing/wan/rule/node.tag/interface/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "Interface name" +help: Interface name diff --git a/templates/load-balancing/wan/rule/node.tag/interface/node.tag/weight/node.def b/templates/load-balancing/wan/rule/node.tag/interface/node.tag/weight/node.def index dfac785..0cad14d 100644 --- a/templates/load-balancing/wan/rule/node.tag/interface/node.tag/weight/node.def +++ b/templates/load-balancing/wan/rule/node.tag/interface/node.tag/weight/node.def @@ -1,5 +1,5 @@ type: u32 -syntax: $(@) >= 0 && $(@) <= 255; "Interface weight must be between 1 and 255" -help: "Load-balance weight" -#comp_help: possible completions: -#<1-255> Set Interface weight +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Interface weight must be between 1 and 255" +help: Load-balance weight +comp_help: possible completions: +<1-255> Set Interface weight diff --git a/templates/load-balancing/wan/rule/node.tag/protocol/node.def b/templates/load-balancing/wan/rule/node.tag/protocol/node.def index 4275317..1363bf1 100644 --- a/templates/load-balancing/wan/rule/node.tag/protocol/node.def +++ b/templates/load-balancing/wan/rule/node.tag/protocol/node.def @@ -1,3 +1,3 @@ type: txt -help: "protocol" +help: protocol diff --git a/templates/load-balancing/wan/rule/node.tag/source/address/node.def b/templates/load-balancing/wan/rule/node.tag/source/address/node.def index 21c2670..45b133b 100644 --- a/templates/load-balancing/wan/rule/node.tag/source/address/node.def +++ b/templates/load-balancing/wan/rule/node.tag/source/address/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: "IPv4 address" +help: IPv4 address diff --git a/templates/load-balancing/wan/rule/node.tag/source/network/node.def b/templates/load-balancing/wan/rule/node.tag/source/network/node.def index 8d1a64d..b88ec3d 100644 --- a/templates/load-balancing/wan/rule/node.tag/source/network/node.def +++ b/templates/load-balancing/wan/rule/node.tag/source/network/node.def @@ -1,2 +1,2 @@ type: ipv4net -help: "IPv4 network address" +help: IPv4 network address diff --git a/templates/load-balancing/wan/rule/node.tag/source/node.def b/templates/load-balancing/wan/rule/node.tag/source/node.def index 9540404..0fcb397 100644 --- a/templates/load-balancing/wan/rule/node.tag/source/node.def +++ b/templates/load-balancing/wan/rule/node.tag/source/node.def @@ -1 +1 @@ -help: "source" +help: source diff --git a/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def b/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def index 862c5a0..6f8bcf5 100644 --- a/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def +++ b/templates/load-balancing/wan/rule/node.tag/source/port-name/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: "port name" +help: port name diff --git a/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def b/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def index 1788b21..599a4c6 100644 --- a/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def +++ b/templates/load-balancing/wan/rule/node.tag/source/port-number/node.def @@ -1,6 +1,6 @@ tag: type: u32 -syntax: $(@) >= 0 && $(@) <= 65535; "port number must be between 1 and 65535" -help: "port number" -#comp_help: possible completions: -#<1-65535> Port number +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 65535; "port number must be between 1 and 65535" +help: port number +comp_help: possible completions: +<1-65535> Port number -- cgit v1.2.3