diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-16 18:11:39 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-16 18:11:39 -0700 |
commit | b292119dd94c8e93032147e3135b4bff17564ff4 (patch) | |
tree | b06b283f4e5f60db06df14f5e7aab263ff48ea9f /templates/interfaces | |
parent | 1a86e15787cdda44b8702895bb97acf107ef3a07 (diff) | |
download | vyatta-cfg-system-b292119dd94c8e93032147e3135b4bff17564ff4.tar.gz vyatta-cfg-system-b292119dd94c8e93032147e3135b4bff17564ff4.zip |
Remove verbs from all help messages
Per current policy remove verb from all help messages in th is package
Diffstat (limited to 'templates/interfaces')
157 files changed, 157 insertions, 157 deletions
diff --git a/templates/interfaces/bonding/node.def b/templates/interfaces/bonding/node.def index 4a944970..d541b422 100644 --- a/templates/interfaces/bonding/node.def +++ b/templates/interfaces/bonding/node.def @@ -1,7 +1,7 @@ tag: priority: 315 type: txt -help: Set bonding interface name +help: Bonding interface name comp_help: Enter bonding interface name (bond0 - bond99) syntax:expression: pattern $VAR(@) "^bond[0-9]+$" \ ; "bonding must be (bond0-bond99)" diff --git a/templates/interfaces/bonding/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/address/node.def index 7221232e..1c6ea9af 100644 --- a/templates/interfaces/bonding/node.tag/address/node.def +++ b/templates/interfaces/bonding/node.tag/address/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set an IP address for this interface +help: IP address syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)" \ ; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)" create:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@) diff --git a/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def index bf4d0f7f..b6c48963 100644 --- a/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def +++ b/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def @@ -1,6 +1,6 @@ type: txt -help: Set this interface to a bridge-group +help: Bridge group interface commit:expression: exec \ "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" diff --git a/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def index 33763624..f25a36ac 100644 --- a/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def +++ b/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the path cost for this port +help: Path cost for this port syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" val_help:<1-65535>; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def index d7a2f7a0..38c11131 100644 --- a/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def +++ b/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the port priority for this port +help: Port priority for this port syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255" val_help:<1-255>; Bridge port priority diff --git a/templates/interfaces/bonding/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/description/node.def index 7f64c788..e4807d2f 100644 --- a/templates/interfaces/bonding/node.tag/description/node.def +++ b/templates/interfaces/bonding/node.tag/description/node.def @@ -1,4 +1,4 @@ type: txt -help: Set description for this interface +help: Description update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias" delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias" diff --git a/templates/interfaces/bonding/node.tag/disable-link-detect/node.def b/templates/interfaces/bonding/node.tag/disable-link-detect/node.def index 83858ec1..7129ff33 100644 --- a/templates/interfaces/bonding/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/bonding/node.tag/disable-link-detect/node.def @@ -1,3 +1,3 @@ -help: Set to ignore link state changes on this interface +help: Ignore link state changes update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off diff --git a/templates/interfaces/bonding/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/disable/node.def index 96325d72..6e684ebd 100644 --- a/templates/interfaces/bonding/node.tag/disable/node.def +++ b/templates/interfaces/bonding/node.tag/disable/node.def @@ -1,4 +1,4 @@ -help: Set interface disabled +help: Disable interface create: /etc/netplug/linkdown.d/dhclient $VAR(../@) if ! ip link set $VAR(../@) down 2>/dev/null; then echo "Error disabling dev $VAR(../@)" diff --git a/templates/interfaces/bonding/node.tag/mac/node.def b/templates/interfaces/bonding/node.tag/mac/node.def index abafa7ab..9b5feacd 100644 --- a/templates/interfaces/bonding/node.tag/mac/node.def +++ b/templates/interfaces/bonding/node.tag/mac/node.def @@ -1,5 +1,5 @@ type: macaddr -help: Set the Media Access Control (MAC) address of this interface +help: Media Access Control (MAC) address syntax:expression: exec "\ /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)" update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/bonding/node.tag/mode/node.def b/templates/interfaces/bonding/node.tag/mode/node.def index bf8a1a8c..ff9c82bc 100644 --- a/templates/interfaces/bonding/node.tag/mode/node.def +++ b/templates/interfaces/bonding/node.tag/mode/node.def @@ -7,7 +7,7 @@ syntax:expression: $VAR(@) in \ "transmit-load-balance", "adaptive-load-balance", "xor-hash" ; \ "mode must be 802.3ad, active-backup, broadcast, round-robin, \ transmit-load-balance, adaptive-load-balance, or xor" -help: Sets the bonding mode +help: Bonding mode update: sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$VAR(../@) --mode=$VAR(@) comp_help: Possible bonding mode diff --git a/templates/interfaces/bonding/node.tag/mtu/node.def b/templates/interfaces/bonding/node.tag/mtu/node.def index cd244402..82941ea1 100644 --- a/templates/interfaces/bonding/node.tag/mtu/node.def +++ b/templates/interfaces/bonding/node.tag/mtu/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the Maximum Transmission Unit (MTU) for this interface +help: Maximum Transmission Unit (MTU) syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000" update: ip link set $VAR(../@) mtu $VAR(@) delete: ip link set $VAR(../@) mtu 1500 diff --git a/templates/interfaces/bonding/node.tag/primary/node.def b/templates/interfaces/bonding/node.tag/primary/node.def index ffa0fd6e..f80c6b8f 100644 --- a/templates/interfaces/bonding/node.tag/primary/node.def +++ b/templates/interfaces/bonding/node.tag/primary/node.def @@ -4,4 +4,4 @@ commit:expression: exec \ "grep -s $VAR(@) /sys/class/net/$VAR(../@)/bonding/slaves" \ ; "Ethernet interface must be part of the bonding group" update: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../@)/bonding/primary" -help: Specify the primary device +help: Primary device interface diff --git a/templates/interfaces/bonding/node.tag/vif/node.def b/templates/interfaces/bonding/node.tag/vif/node.def index 62e7ab95..a9cc2bfa 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.def @@ -1,7 +1,7 @@ tag: priority: 320 type: u32 -help: Set Virtual Local Area Network (VLAN) ID +help: Virtual Local Area Network (VLAN) ID syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094" create: read -a SLAVES </sys/class/net/$VAR(../@)/bonding/slaves if [ ${#SLAVES[*]} -eq 0 ]; then diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def index f48d4d5b..84bd9e3b 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set an IP address for this interface +help: IP address syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../../@).$VAR(../@) "\ ; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../../@).$VAR(../@)" create:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../../@).$VAR(../@) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def index 4e3e22ec..0766f8af 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def @@ -1,6 +1,6 @@ type: txt -help: Set this interface to a bridge-group +help: Bridge group interface commit:expression: exec \ "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def index 33763624..f25a36ac 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the path cost for this port +help: Path cost for this port syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" val_help:<1-65535>; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def index d7a2f7a0..38c11131 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the port priority for this port +help: Port priority for this port syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255" val_help:<1-255>; Bridge port priority diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def index 0ef54891..ce6c5fd0 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def @@ -1,4 +1,4 @@ type: txt -help: Set description for this interface +help: Description update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias" delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias" diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect/node.def index 897113de..5f60e6ab 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect/node.def @@ -1,3 +1,3 @@ -help: Set to ignore link state changes on this interface +help: Ignore link state changes update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../@).$VAR(../@) on delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../@).$VAR(../@) off diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def index b2119c9c..e9943645 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def @@ -1,4 +1,4 @@ -help: Set interface disabled +help: Disable interface update: /etc/netplug/linkdown.d/dhclient $VAR(../../@).$VAR(../@) if ! ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then echo "Error disabling dev $VAR(../../@).$VAR(../@)" diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def index d87ad6b7..75c5447e 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def @@ -2,7 +2,7 @@ tag: type: u32 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255" commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)" -help: Set VRRP group number +help: VRRP group number delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../../@).$VAR(../../@) --group $VAR(@) " comp_help: possible completions <1-255> VRRP group number diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def index 59f2b451..fa2dbced 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def @@ -1,6 +1,6 @@ type: u32 default: 1 -help: Set advertise interval +help: Advertise interval syntax:expression: $VAR(@) >= 1 && $VAR(@) <=255; "Advertise interval must be between 1-255" comp_help: possible completions <1-255> Set advertise interval (default 1) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def index adf78b3f..9869bcb3 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def @@ -1,3 +1,3 @@ -help: Set authentication +help: Authentication commit:expression: $VAR(./type/@) != ""; "You must set a authentication type" commit:expression: $VAR(./password/@) != ""; "You must set a authentication password" diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def index 9bd2e98d..9a671375 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Set password +help: Password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def index 7155495d..f099153f 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def @@ -1,5 +1,5 @@ type: txt -help: Set authentication type +help: Authentication type syntax:expression: $VAR(@) in "plaintext-password", "ah"; \ "authentication must be plaintext-password or ah" comp_help: possible completions: diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def index aeb40f0b..849e5273 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set description for this interface +help: Description diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def index 916e313b..a0e0c576 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def @@ -1 +1 @@ -help: Set VRRP group disabled +help: Disable VRRP group diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def index edb0d58a..9e062980 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def @@ -1,6 +1,6 @@ type: ipv4 -help: Set hello-source-address +help: Hello source address comp_help: possible completions: <x.x.x.x> Set source address for vrrp hello packets (optional) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def index 1638624e..98cd916f 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def @@ -1,6 +1,6 @@ type: u32 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \ "preempt-delay must be between 0-1000" -help: Set preempt-delay +help: Preempt-delay comp_help: possible completions: <0-1000> Set Preempt Delay in seconds diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def index 7b3b9cbd..e1e5aa96 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def @@ -1,5 +1,5 @@ type: txt -help: Set preempt mode (default: true) +help: Preempt mode(default: true) default: "true" syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false" comp_help: possible completions: diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def index 54de02c7..504eebc4 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def @@ -1,5 +1,5 @@ type: u32 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255" -help: Set priority +help: Priority comp_help: possible completions: <1-255> Set Priority diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def index 44be2a7f..88fbb670 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to backup +help: Script to run on VRRP state-transition to backup type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Backup Script should be an existing executable" diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def index 9f2557b3..2d2c08d0 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to fault +help: Script to run on VRRP state-transition to fault type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Fault Script should be an existing executable" diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def index 7f7d8895..e3eb0175 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to master +help: Script to run on VRRP state-transition to master type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Master Script should be an existing executable" diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def index ed959156..90f54c0e 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def @@ -1,2 +1,2 @@ -help: Set scripts to run on VRRP state-transitions +help: Scripts to run on VRRP state-transitions diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def index 9602a842..a7d2e1fd 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def @@ -1,2 +1,2 @@ type: txt -help: Set to add this vrrp group to a sync group +help: Add this vrrp group to a sync group diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def index 176287aa..ab3d6290 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set virtual address +help: Virtual address syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl \ --vrrp-action='check-vip' --vip='$VAR(@)' "\ diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def index a3ce1395..c0efa6f4 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def @@ -2,7 +2,7 @@ tag: type: u32 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255" commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)" -help: Set VRRP group number +help: VRRP group number delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../@) --group $VAR(@) " comp_help: possible completions <1-255> VRRP group number diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def index 59f2b451..fa2dbced 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def @@ -1,6 +1,6 @@ type: u32 default: 1 -help: Set advertise interval +help: Advertise interval syntax:expression: $VAR(@) >= 1 && $VAR(@) <=255; "Advertise interval must be between 1-255" comp_help: possible completions <1-255> Set advertise interval (default 1) diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def index adf78b3f..9869bcb3 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def @@ -1,3 +1,3 @@ -help: Set authentication +help: Authentication commit:expression: $VAR(./type/@) != ""; "You must set a authentication type" commit:expression: $VAR(./password/@) != ""; "You must set a authentication password" diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def index 9bd2e98d..9a671375 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Set password +help: Password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def index 687c6af6..21e2e165 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def @@ -1,5 +1,5 @@ type: txt -help: Set authentication type +help: Authentication type syntax:expression: $VAR(@) in "plaintext-password", "ah"; \ "authentication must be plaintext-password or ah" comp_help: possible completions: diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def index aeb40f0b..849e5273 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set description for this interface +help: Description diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def index 916e313b..a0e0c576 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def @@ -1 +1 @@ -help: Set VRRP group disabled +help: Disable VRRP group diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def index edb0d58a..9e062980 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def @@ -1,6 +1,6 @@ type: ipv4 -help: Set hello-source-address +help: Hello source address comp_help: possible completions: <x.x.x.x> Set source address for vrrp hello packets (optional) diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def index 1638624e..98cd916f 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def @@ -1,6 +1,6 @@ type: u32 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \ "preempt-delay must be between 0-1000" -help: Set preempt-delay +help: Preempt-delay comp_help: possible completions: <0-1000> Set Preempt Delay in seconds diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def index 4ed282ed..c3dc66cd 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def @@ -1,5 +1,5 @@ type: txt -help: Set preempt mode +help: Preempt mode default: "true" syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false" comp_help: possible completions: diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def index 54de02c7..504eebc4 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def @@ -1,5 +1,5 @@ type: u32 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255" -help: Set priority +help: Priority comp_help: possible completions: <1-255> Set Priority diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def index 44be2a7f..88fbb670 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to backup +help: Script to run on VRRP state-transition to backup type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Backup Script should be an existing executable" diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def index 9f2557b3..2d2c08d0 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to fault +help: Script to run on VRRP state-transition to fault type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Fault Script should be an existing executable" diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def index 7f7d8895..e3eb0175 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to master +help: Script to run on VRRP state-transition to master type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Master Script should be an existing executable" diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def index 3abc1696..6d3a6c11 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def @@ -1,2 +1,2 @@ -help: Set scripts for VRRP state-transitions +help: Scripts for VRRP state-transitions diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def index 9602a842..a7d2e1fd 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def @@ -1,2 +1,2 @@ type: txt -help: Set to add this vrrp group to a sync group +help: Add this vrrp group to a sync group diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def index 176287aa..ab3d6290 100644 --- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def +++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set virtual address +help: Virtual address syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl \ --vrrp-action='check-vip' --vip='$VAR(@)' "\ diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def index 60af4bc0..e4638c44 100644 --- a/templates/interfaces/bridge/node.def +++ b/templates/interfaces/bridge/node.def @@ -1,7 +1,7 @@ tag: priority: 310 type: txt -help: Set bridge interface name +help: Bridge interface name comp_help: "Enter bridge interface name (br0 - br999)" syntax:expression: pattern $VAR(@) "^br[0-9]+$" ; "Must be (br0 - br999)" diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def index 7a9382b7..5208faf8 100644 --- a/templates/interfaces/bridge/node.tag/address/node.def +++ b/templates/interfaces/bridge/node.tag/address/node.def @@ -1,7 +1,7 @@ multi: priority: 320 type: txt -help: Set an IP address for this interface +help: IP address syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)";\ "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)" create: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@) diff --git a/templates/interfaces/bridge/node.tag/aging/node.def b/templates/interfaces/bridge/node.tag/aging/node.def index cd2e5d1a..77c6a8b2 100644 --- a/templates/interfaces/bridge/node.tag/aging/node.def +++ b/templates/interfaces/bridge/node.tag/aging/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the number of seconds a MAC address will be kept in the forwarding database +help: Interval addresses are retained default: 300 update: /usr/sbin/brctl setageing $VAR(../@) $VAR(@) delete: /usr/sbin/brctl setageing $VAR(../@) 300 diff --git a/templates/interfaces/bridge/node.tag/description/node.def b/templates/interfaces/bridge/node.tag/description/node.def index 7f64c788..e4807d2f 100644 --- a/templates/interfaces/bridge/node.tag/description/node.def +++ b/templates/interfaces/bridge/node.tag/description/node.def @@ -1,4 +1,4 @@ type: txt -help: Set description for this interface +help: Description update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias" delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias" diff --git a/templates/interfaces/bridge/node.tag/disable-link-detect/node.def b/templates/interfaces/bridge/node.tag/disable-link-detect/node.def index 83858ec1..7129ff33 100644 --- a/templates/interfaces/bridge/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/bridge/node.tag/disable-link-detect/node.def @@ -1,3 +1,3 @@ -help: Set to ignore link state changes on this interface +help: Ignore link state changes update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off diff --git a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def index c273c648..e122c340 100644 --- a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def +++ b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the forwarding delay +help: Forwarding delay update: /usr/sbin/brctl setfd $VAR(../@) $VAR(@) comp_help: possible completions: <number> Set the folwarding delay (default 15) diff --git a/templates/interfaces/bridge/node.tag/hello-time/node.def b/templates/interfaces/bridge/node.tag/hello-time/node.def index 8c6ad277..126e7020 100644 --- a/templates/interfaces/bridge/node.tag/hello-time/node.def +++ b/templates/interfaces/bridge/node.tag/hello-time/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the hello packet advertisment interval +help: Hello packet advertisment interval default: 2 update: /usr/sbin/brctl sethello $VAR(../@) $VAR(@) delete: /usr/sbin/brctl sethello $VAR(../@) 2 diff --git a/templates/interfaces/bridge/node.tag/max-age/node.def b/templates/interfaces/bridge/node.tag/max-age/node.def index 43a9ad04..7ce7fd9d 100644 --- a/templates/interfaces/bridge/node.tag/max-age/node.def +++ b/templates/interfaces/bridge/node.tag/max-age/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the interval at which neighbor bridges are removed +help: Interval at which neighbor bridges are removed default: 20 update: /usr/sbin/brctl setmaxage $VAR(../@) $VAR(@) delete: /usr/sbin/brctl setmaxage $VAR(../@) 20 diff --git a/templates/interfaces/bridge/node.tag/priority/node.def b/templates/interfaces/bridge/node.tag/priority/node.def index 41c0a682..8fc0a683 100644 --- a/templates/interfaces/bridge/node.tag/priority/node.def +++ b/templates/interfaces/bridge/node.tag/priority/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the priority for this bridge +help: Priority for this bridge default: 0 syntax:expression:$VAR(@) < 65536 ; "Bridge priority must be between 0 and 65535" val_help:<0-65535>; Bridge priority (default 0) diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def index 05b2e03c..1b0a083f 100644 --- a/templates/interfaces/ethernet/node.def +++ b/templates/interfaces/ethernet/node.def @@ -1,7 +1,7 @@ tag: priority: 318 type: txt -help: Set Ethernet interface name +help: Ethernet interface name comp_help: Enter Ethernet interface name (eth0 - eth999) allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet diff --git a/templates/interfaces/ethernet/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/address/node.def index f503b174..f2bff386 100644 --- a/templates/interfaces/ethernet/node.tag/address/node.def +++ b/templates/interfaces/ethernet/node.tag/address/node.def @@ -2,7 +2,7 @@ multi: type: txt -help: Set an IP address for this interface +help: IP address # Syntax check at "set" time. Give curent address value to script # so that it can perform syntax check. diff --git a/templates/interfaces/ethernet/node.tag/bond-group/node.def b/templates/interfaces/ethernet/node.tag/bond-group/node.def index c173ae3f..cb339a42 100644 --- a/templates/interfaces/ethernet/node.tag/bond-group/node.def +++ b/templates/interfaces/ethernet/node.tag/bond-group/node.def @@ -1,6 +1,6 @@ priority: 319 type: txt -help: Add this interface to a bonding group +help: Assign interface to bonding group commit:expression: exec \ "${vyatta_sbindir}/vyatta-interfaces.pl --dev=$VAR(@) --check=bonding" diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def index a4014a29..930a5809 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def @@ -1,6 +1,6 @@ type: txt -help: Set this interface to a bridge-group +help: Bridge group name commit:expression: exec \ "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def index 33763624..2b1e6243 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the path cost for this port +help: Bridge port cost syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" val_help:<1-65535>; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def index d7a2f7a0..35bd1a3f 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the port priority for this port +help: Bridge port priority syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255" val_help:<1-255>; Bridge port priority diff --git a/templates/interfaces/ethernet/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/description/node.def index 7f64c788..e4807d2f 100644 --- a/templates/interfaces/ethernet/node.tag/description/node.def +++ b/templates/interfaces/ethernet/node.tag/description/node.def @@ -1,4 +1,4 @@ type: txt -help: Set description for this interface +help: Description update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias" delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias" diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def index aaeca067..29440a09 100644 --- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def @@ -9,7 +9,7 @@ priority: 317 # Run before interface has been configured -help: Set options for DHCPv6 +help: DHCPv6 options end: ifname="$VAR(../@)" diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/parameters-only/node.def index 0178c469..0e407f81 100644 --- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/parameters-only/node.def +++ b/templates/interfaces/ethernet/node.tag/dhcpv6-options/parameters-only/node.def @@ -1,3 +1,3 @@ -help: Acquire only config parameters, not address, via DHCPv6 +help: Acquire only config parameters, not address diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/temporary/node.def index afb9de9c..a850ef4b 100644 --- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/temporary/node.def +++ b/templates/interfaces/ethernet/node.tag/dhcpv6-options/temporary/node.def @@ -1,3 +1,3 @@ -help: Acquire a "temporary" IPv6 address +help: IPv6 "temporary" address diff --git a/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def b/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def index b9884121..702e1d29 100644 --- a/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def +++ b/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def @@ -1,6 +1,6 @@ priority: 320 # Must run after interface is configured. -help: Set to disable Ethernet flow control (pause frames) +help: Disable Ethernet flow control (pause frames) create: sudo ethtool --pause $VAR(../@) autoneg off tx off rx off diff --git a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def index 83858ec1..7129ff33 100644 --- a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def @@ -1,3 +1,3 @@ -help: Set to ignore link state changes on this interface +help: Ignore link state changes update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off diff --git a/templates/interfaces/ethernet/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/disable/node.def index 5fe2b748..92f150dd 100644 --- a/templates/interfaces/ethernet/node.tag/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/disable/node.def @@ -1,4 +1,4 @@ -help: Set interface disabled +help: Disable interface create: /etc/netplug/linkdown.d/dhclient $VAR(../@) if ! ip link set $VAR(../@) down 2>/dev/null; then echo "Error disabling dev $VAR(../@)" diff --git a/templates/interfaces/ethernet/node.tag/duplex/node.def b/templates/interfaces/ethernet/node.tag/duplex/node.def index 9277729d..c4419a2c 100644 --- a/templates/interfaces/ethernet/node.tag/duplex/node.def +++ b/templates/interfaces/ethernet/node.tag/duplex/node.def @@ -1,5 +1,5 @@ type: txt -help: Set the duplex mode for this interface +help: Duplex mode default: "auto" syntax:expression: $VAR(@) in "auto", "half", "full"; "duplex must be auto, half or full" commit:expression: ( $VAR(@) == "auto" && $VAR(../speed/@) == "auto" ) || \ diff --git a/templates/interfaces/ethernet/node.tag/hw-id/node.def b/templates/interfaces/ethernet/node.tag/hw-id/node.def index 6c559f89..e2b8497d 100644 --- a/templates/interfaces/ethernet/node.tag/hw-id/node.def +++ b/templates/interfaces/ethernet/node.tag/hw-id/node.def @@ -1,2 +1,2 @@ type: macaddr -help: Set the Media Access Control (MAC) address of this interface +help: Media Access Control (MAC) address diff --git a/templates/interfaces/ethernet/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/ethernet/node.tag/ip/enable-proxy-arp/node.def index e125e5c5..ae7ba09a 100644 --- a/templates/interfaces/ethernet/node.tag/ip/enable-proxy-arp/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/enable-proxy-arp/node.def @@ -1,3 +1,3 @@ -help: Set to enable proxy-arp on this interface +help: Enable proxy-arp on this interface create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp\" " delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp\" " diff --git a/templates/interfaces/ethernet/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/mac/node.def index f3946adf..c9fbb0fe 100644 --- a/templates/interfaces/ethernet/node.tag/mac/node.def +++ b/templates/interfaces/ethernet/node.tag/mac/node.def @@ -1,6 +1,6 @@ type: macaddr priority: 317 # must be set before dhcp client -help: Set the Media Access Control (MAC) address of this interface +help: Media Access Control (MAC) address syntax:expression: exec "\ /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)" update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/ethernet/node.tag/mtu/node.def b/templates/interfaces/ethernet/node.tag/mtu/node.def index f33158f8..043f335e 100644 --- a/templates/interfaces/ethernet/node.tag/mtu/node.def +++ b/templates/interfaces/ethernet/node.tag/mtu/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the Maximum Transmission Unit (MTU) for this interface +help: Maximum Transmission Unit (MTU) syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000" update: if ! ip link set $VAR(../@) mtu $VAR(@) then echo "Error setting MTU on dev $VAR(../@)"; exit 1 diff --git a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def index 68f4b6f9..ae1e3da7 100644 --- a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def +++ b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def @@ -13,7 +13,7 @@ priority: 319 # Failure barrier only - no ordering constraints type: txt -help: Set CPU interrupt affinity mask for this interface +help: CPU interrupt affinity mask comp_help: Possible completions: XX\tHexidecimal bitmask representing CPUs that this NIC will interrupt diff --git a/templates/interfaces/ethernet/node.tag/speed/node.def b/templates/interfaces/ethernet/node.tag/speed/node.def index e822df9f..932c88e5 100644 --- a/templates/interfaces/ethernet/node.tag/speed/node.def +++ b/templates/interfaces/ethernet/node.tag/speed/node.def @@ -1,5 +1,5 @@ type: txt -help: Set the speed for this interface +help: Link speed default: "auto" syntax:expression: $VAR(@) in "auto", "10", "100", "1000", "2500", "10000"; "Speed must be auto, 10, 100, 1000, 2500, or 10000" commit:expression: ( $VAR(@) == "auto" && $VAR(../duplex/@) == "auto" ) || \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def index c14ed002..1ad32323 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.def @@ -1,7 +1,7 @@ tag: priority: 319 type: u32 -help: Set Virtual Local Area Network (VLAN) ID +help: Virtual Local Area Network (VLAN) ID syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def index 1e8b2f46..b3f360b6 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def @@ -2,7 +2,7 @@ multi: type: txt -help: Set an IP address for this interface +help: IP address # Syntax check at "set" time. Give curent address value to script # so that it can perform syntax check. diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def index a4014a29..0d1f16e2 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def @@ -1,6 +1,6 @@ type: txt -help: Set this interface to a bridge-group +help: Bridge group interface commit:expression: exec \ "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def index 33763624..f25a36ac 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the path cost for this port +help: Path cost for this port syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" val_help:<1-65535>; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def index d7a2f7a0..38c11131 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the port priority for this port +help: Port priority for this port syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255" val_help:<1-255>; Bridge port priority diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def index 0ef54891..ce6c5fd0 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def @@ -1,4 +1,4 @@ type: txt -help: Set description for this interface +help: Description update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias" delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def index 897113de..5f60e6ab 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def @@ -1,3 +1,3 @@ -help: Set to ignore link state changes on this interface +help: Ignore link state changes update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../@).$VAR(../@) on delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../@).$VAR(../@) off diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def index b2119c9c..e9943645 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def @@ -1,4 +1,4 @@ -help: Set interface disabled +help: Disable interface update: /etc/netplug/linkdown.d/dhclient $VAR(../../@).$VAR(../@) if ! ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then echo "Error disabling dev $VAR(../../@).$VAR(../@)" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def index a45d4129..cd6d56d9 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def @@ -1,3 +1,3 @@ -help: Set to enable proxy-arp on this interface +help: Enable proxy-arp on this interface create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp\" " delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp\" " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def index 6d58896a..6abc6f89 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def @@ -1,3 +1,3 @@ -help: Configure Virtual Router Redundancy Protocol (VRRP) parameters +help: Virtual Router Redundancy Protocol (VRRP) parameters priority: 800 end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../../@).$VAR(../@) " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def index d87ad6b7..75c5447e 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def @@ -2,7 +2,7 @@ tag: type: u32 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255" commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)" -help: Set VRRP group number +help: VRRP group number delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../../@).$VAR(../../@) --group $VAR(@) " comp_help: possible completions <1-255> VRRP group number diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def index 59f2b451..fa2dbced 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def @@ -1,6 +1,6 @@ type: u32 default: 1 -help: Set advertise interval +help: Advertise interval syntax:expression: $VAR(@) >= 1 && $VAR(@) <=255; "Advertise interval must be between 1-255" comp_help: possible completions <1-255> Set advertise interval (default 1) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def index adf78b3f..9869bcb3 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def @@ -1,3 +1,3 @@ -help: Set authentication +help: Authentication commit:expression: $VAR(./type/@) != ""; "You must set a authentication type" commit:expression: $VAR(./password/@) != ""; "You must set a authentication password" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def index 9bd2e98d..9a671375 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Set password +help: Password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def index 7155495d..f099153f 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def @@ -1,5 +1,5 @@ type: txt -help: Set authentication type +help: Authentication type syntax:expression: $VAR(@) in "plaintext-password", "ah"; \ "authentication must be plaintext-password or ah" comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def index aeb40f0b..849e5273 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set description for this interface +help: Description diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def index 916e313b..a0e0c576 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def @@ -1 +1 @@ -help: Set VRRP group disabled +help: Disable VRRP group diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def index edb0d58a..9e062980 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def @@ -1,6 +1,6 @@ type: ipv4 -help: Set hello-source-address +help: Hello source address comp_help: possible completions: <x.x.x.x> Set source address for vrrp hello packets (optional) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def index 1638624e..98cd916f 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def @@ -1,6 +1,6 @@ type: u32 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \ "preempt-delay must be between 0-1000" -help: Set preempt-delay +help: Preempt-delay comp_help: possible completions: <0-1000> Set Preempt Delay in seconds diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def index 7b3b9cbd..e1e5aa96 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def @@ -1,5 +1,5 @@ type: txt -help: Set preempt mode (default: true) +help: Preempt mode(default: true) default: "true" syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false" comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def index 54de02c7..504eebc4 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def @@ -1,5 +1,5 @@ type: u32 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255" -help: Set priority +help: Priority comp_help: possible completions: <1-255> Set Priority diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def index 44be2a7f..88fbb670 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to backup +help: Script to run on VRRP state-transition to backup type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Backup Script should be an existing executable" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def index 9f2557b3..2d2c08d0 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to fault +help: Script to run on VRRP state-transition to fault type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Fault Script should be an existing executable" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def index 7f7d8895..e3eb0175 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to master +help: Script to run on VRRP state-transition to master type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Master Script should be an existing executable" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def index ed959156..6d195d07 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def @@ -1,2 +1,2 @@ -help: Set scripts to run on VRRP state-transitions +help: scripts to run on VRRP state-transitions diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def index 9602a842..a7d2e1fd 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def @@ -1,2 +1,2 @@ type: txt -help: Set to add this vrrp group to a sync group +help: Add this vrrp group to a sync group diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def index df9a134f..617ed1f6 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set virtual address [REQUIRED] +help: Virtual address [REQUIRED] syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl \ --vrrp-action='check-vip' --vip='$VAR(@)' "\ diff --git a/templates/interfaces/ethernet/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vrrp/node.def index 3b3e083e..a9224ed9 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/node.def @@ -1,3 +1,3 @@ -help: Configure Virtual Router Redundancy Protocol (VRRP) +help: Virtual Router Redundancy Protocol (VRRP) priority: 800 end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../@) " diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def index a3ce1395..c0efa6f4 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def @@ -2,7 +2,7 @@ tag: type: u32 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255" commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)" -help: Set VRRP group number +help: VRRP group number delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../@) --group $VAR(@) " comp_help: possible completions <1-255> VRRP group number diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def index 59f2b451..fa2dbced 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def @@ -1,6 +1,6 @@ type: u32 default: 1 -help: Set advertise interval +help: Advertise interval syntax:expression: $VAR(@) >= 1 && $VAR(@) <=255; "Advertise interval must be between 1-255" comp_help: possible completions <1-255> Set advertise interval (default 1) diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def index adf78b3f..9869bcb3 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def @@ -1,3 +1,3 @@ -help: Set authentication +help: Authentication commit:expression: $VAR(./type/@) != ""; "You must set a authentication type" commit:expression: $VAR(./password/@) != ""; "You must set a authentication password" diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def index 9bd2e98d..9a671375 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Set password +help: Password syntax:expression: exec " \ if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \ echo Password must be 8 characters or less ; \ diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def index 687c6af6..21e2e165 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def @@ -1,5 +1,5 @@ type: txt -help: Set authentication type +help: Authentication type syntax:expression: $VAR(@) in "plaintext-password", "ah"; \ "authentication must be plaintext-password or ah" comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def index aeb40f0b..849e5273 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set description for this interface +help: Description diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def index 916e313b..93e4cc3e 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def @@ -1 +1 @@ -help: Set VRRP group disabled +help: VRRP group disabled diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def index edb0d58a..9e062980 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def @@ -1,6 +1,6 @@ type: ipv4 -help: Set hello-source-address +help: Hello source address comp_help: possible completions: <x.x.x.x> Set source address for vrrp hello packets (optional) diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def index 1638624e..2018ff44 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def @@ -1,6 +1,6 @@ type: u32 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \ "preempt-delay must be between 0-1000" -help: Set preempt-delay +help: Preempt delay comp_help: possible completions: <0-1000> Set Preempt Delay in seconds diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def index 4ed282ed..c3dc66cd 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def @@ -1,5 +1,5 @@ type: txt -help: Set preempt mode +help: Preempt mode default: "true" syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false" comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def index 54de02c7..504eebc4 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def @@ -1,5 +1,5 @@ type: u32 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255" -help: Set priority +help: Priority comp_help: possible completions: <1-255> Set Priority diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def index 44be2a7f..88fbb670 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to backup +help: Script to run on VRRP state-transition to backup type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Backup Script should be an existing executable" diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def index 9f2557b3..2d2c08d0 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to fault +help: Script to run on VRRP state-transition to fault type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Fault Script should be an existing executable" diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def index 7f7d8895..e3eb0175 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def @@ -1,4 +1,4 @@ -help: Set an executable script to run on VRRP state-transition to master +help: Script to run on VRRP state-transition to master type: txt syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Master Script should be an existing executable" diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def index 3abc1696..6d3a6c11 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def @@ -1,2 +1,2 @@ -help: Set scripts for VRRP state-transitions +help: Scripts for VRRP state-transitions diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def index 9602a842..a7d2e1fd 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def @@ -1,2 +1,2 @@ type: txt -help: Set to add this vrrp group to a sync group +help: Add this vrrp group to a sync group diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def index df9a134f..617ed1f6 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set virtual address [REQUIRED] +help: Virtual address [REQUIRED] syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl \ --vrrp-action='check-vip' --vip='$VAR(@)' "\ diff --git a/templates/interfaces/input/node.def b/templates/interfaces/input/node.def index 1873190c..8aadec8a 100644 --- a/templates/interfaces/input/node.def +++ b/templates/interfaces/input/node.def @@ -1,7 +1,7 @@ tag: priority: 310 # before real devices that redirect type: txt -help: Set input functional block (IFB) interface +help: Input functional block (IFB) interface name comp_help: Enter input functional block interface name (ifb0 - ifb999) syntax:expression: pattern $VAR(@) "^ifb[0-9]+$" ; "name must be (ifb0-ifb999)" diff --git a/templates/interfaces/input/node.tag/description/node.def b/templates/interfaces/input/node.tag/description/node.def index 7f64c788..e4807d2f 100644 --- a/templates/interfaces/input/node.tag/description/node.def +++ b/templates/interfaces/input/node.tag/description/node.def @@ -1,4 +1,4 @@ type: txt -help: Set description for this interface +help: Description update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias" delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias" diff --git a/templates/interfaces/loopback/node.def b/templates/interfaces/loopback/node.def index b78cf10b..828f70ec 100644 --- a/templates/interfaces/loopback/node.def +++ b/templates/interfaces/loopback/node.def @@ -1,7 +1,7 @@ tag: priority: 300 type: txt -help: Set loopback interface name +help: Loopback interface name comp_help: Enter looback interface name (lo) syntax:expression: exec \ "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=loopback" diff --git a/templates/interfaces/loopback/node.tag/address/node.def b/templates/interfaces/loopback/node.tag/address/node.def index 76c2e76e..3fb6d38c 100644 --- a/templates/interfaces/loopback/node.tag/address/node.def +++ b/templates/interfaces/loopback/node.tag/address/node.def @@ -2,7 +2,7 @@ multi: type: txt -help: Set an IP address for this interface +help: IP address syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-set $VAR(@) --dev $VAR(../@)"; \ "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)" diff --git a/templates/interfaces/loopback/node.tag/description/node.def b/templates/interfaces/loopback/node.tag/description/node.def index 7f64c788..e4807d2f 100644 --- a/templates/interfaces/loopback/node.tag/description/node.def +++ b/templates/interfaces/loopback/node.tag/description/node.def @@ -1,4 +1,4 @@ type: txt -help: Set description for this interface +help: Description update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias" delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias" diff --git a/templates/interfaces/node.def b/templates/interfaces/node.def index 286b8786..ee75b174 100644 --- a/templates/interfaces/node.def +++ b/templates/interfaces/node.def @@ -1,2 +1,2 @@ priority: 850 -help: Configure network interfaces +help: Network interfaces diff --git a/templates/interfaces/pseudo-ethernet/link/node.def b/templates/interfaces/pseudo-ethernet/link/node.def index 844cb8d8..40818d54 100644 --- a/templates/interfaces/pseudo-ethernet/link/node.def +++ b/templates/interfaces/pseudo-ethernet/link/node.def @@ -2,4 +2,4 @@ type: txt syntax:expression: exec \ "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=ethernet" allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet -help: Specify the lower link device +help: Lower link device diff --git a/templates/interfaces/pseudo-ethernet/node.def b/templates/interfaces/pseudo-ethernet/node.def index bf88b047..b0c00a27 100644 --- a/templates/interfaces/pseudo-ethernet/node.def +++ b/templates/interfaces/pseudo-ethernet/node.def @@ -1,7 +1,7 @@ tag: priority: 390 type: txt -help: Set Pseudo Ethernet device name +help: Pseudo Ethernet device name comp_help: Enter Pseudo Ethernet interface name (peth0 - peth999) syntax:expression: pattern $VAR(@) "^peth[0-9]+$" \ ; "name must be (peth0-peth999)" diff --git a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def index 7221232e..1c6ea9af 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set an IP address for this interface +help: IP address syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)" \ ; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)" create:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@) diff --git a/templates/interfaces/pseudo-ethernet/node.tag/description/node.def b/templates/interfaces/pseudo-ethernet/node.tag/description/node.def index 7f64c788..e2a1534b 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/description/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/description/node.def @@ -1,4 +1,4 @@ type: txt -help: Set description for this interface +help: Description for this interface update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias" delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias" diff --git a/templates/interfaces/pseudo-ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/pseudo-ethernet/node.tag/disable-link-detect/node.def index 83858ec1..7129ff33 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/disable-link-detect/node.def @@ -1,3 +1,3 @@ -help: Set to ignore link state changes on this interface +help: Ignore link state changes update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off diff --git a/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def b/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def index 9dafeacf..91c60323 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def @@ -1,4 +1,4 @@ -help: Set interface disabled +help: Disable interface create: vif=`/opt/vyatta/sbin/vyatta-interfaces.pl --vif=$VAR(../@) --show=all` if [ ! -z "$vif" ]; then echo "Can not disable interface " $VAR(../@) " with vif:" $vif diff --git a/templates/interfaces/pseudo-ethernet/node.tag/link/node.def b/templates/interfaces/pseudo-ethernet/node.tag/link/node.def index f16b0ec4..13d4c612 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/link/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/link/node.def @@ -2,4 +2,4 @@ type: txt commit:expression: exec \ "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=ethernet" allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet -help: Specify the lower link device +help: Lower link device diff --git a/templates/interfaces/pseudo-ethernet/node.tag/mac/node.def b/templates/interfaces/pseudo-ethernet/node.tag/mac/node.def index e1202aca..8d9e2f16 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/mac/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/mac/node.def @@ -1,5 +1,5 @@ type: macaddr -help: Set the Media Access Control (MAC) address of this interface +help: Media Access Control (MAC) address syntax:expression: exec "\ /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)" update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def index a90c01f9..c0e871a1 100644 --- a/templates/interfaces/tunnel/node.def +++ b/templates/interfaces/tunnel/node.def @@ -1,7 +1,7 @@ tag: priority: 380 type: txt -help: Set tunnel interface +help: Tunnel interface comp_help: Enter tunnel interface name (tun0 - tun999) syntax:expression: pattern $VAR(@) "^tun[0-9]+$" \ ; "tunnel must be (tun0-tun999)" diff --git a/templates/interfaces/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def index c7c564fd..747347b3 100644 --- a/templates/interfaces/tunnel/node.tag/address/node.def +++ b/templates/interfaces/tunnel/node.tag/address/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set an IP address for this interface +help: IP address syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)"; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)" diff --git a/templates/interfaces/tunnel/node.tag/bridge-group/bridge/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/bridge/node.def index 9c28ed63..5100a190 100644 --- a/templates/interfaces/tunnel/node.tag/bridge-group/bridge/node.def +++ b/templates/interfaces/tunnel/node.tag/bridge-group/bridge/node.def @@ -1,5 +1,5 @@ type: txt -help: Set this interface to a bridge-group +help: Bridge group interface allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge commit:expression: exec \ "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" diff --git a/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def index 33763624..f25a36ac 100644 --- a/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def +++ b/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the path cost for this port +help: Path cost for this port syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" val_help:<1-65535>; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def index d7a2f7a0..38c11131 100644 --- a/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def +++ b/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the port priority for this port +help: Port priority for this port syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255" val_help:<1-255>; Bridge port priority diff --git a/templates/interfaces/tunnel/node.tag/description/node.def b/templates/interfaces/tunnel/node.tag/description/node.def index 7f64c788..e4807d2f 100644 --- a/templates/interfaces/tunnel/node.tag/description/node.def +++ b/templates/interfaces/tunnel/node.tag/description/node.def @@ -1,4 +1,4 @@ type: txt -help: Set description for this interface +help: Description update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias" delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias" diff --git a/templates/interfaces/tunnel/node.tag/disable-link-detect/node.def b/templates/interfaces/tunnel/node.tag/disable-link-detect/node.def index 83858ec1..7129ff33 100644 --- a/templates/interfaces/tunnel/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/tunnel/node.tag/disable-link-detect/node.def @@ -1,3 +1,3 @@ -help: Set to ignore link state changes on this interface +help: Ignore link state changes update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off diff --git a/templates/interfaces/tunnel/node.tag/encapsulation/node.def b/templates/interfaces/tunnel/node.tag/encapsulation/node.def index 5374568c..50480b93 100644 --- a/templates/interfaces/tunnel/node.tag/encapsulation/node.def +++ b/templates/interfaces/tunnel/node.tag/encapsulation/node.def @@ -1,5 +1,5 @@ type: txt -help: Set the encapsulation of this tunnel interface [REQUIRED] +help: Encapsulation of this tunnel interface [REQUIRED] syntax:expression: $VAR(@) in "ipip", "gre", "sit", "gre-bridge"; "Must be (ipip, gre, gre-bridge, sit)" diff --git a/templates/interfaces/tunnel/node.tag/key/node.def b/templates/interfaces/tunnel/node.tag/key/node.def index c137107c..2362423f 100644 --- a/templates/interfaces/tunnel/node.tag/key/node.def +++ b/templates/interfaces/tunnel/node.tag/key/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the tunnel key +help: Tunnel key syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 999999; \ "Must be between 0-999999 for $VAR(../@)" syntax:expression: exec " \ diff --git a/templates/interfaces/tunnel/node.tag/local-ip/node.def b/templates/interfaces/tunnel/node.tag/local-ip/node.def index 425a8a57..ea11f6e1 100644 --- a/templates/interfaces/tunnel/node.tag/local-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/local-ip/node.def @@ -1,5 +1,5 @@ type: ipv4 -help: Set the local IP address for this tunnel [REQUIRED] +help: Local IP address for this tunnel [REQUIRED] syntax:expression: exec \ "if [ -z \"`ip addr list | grep $VAR(@) `\" ]; then \ diff --git a/templates/interfaces/tunnel/node.tag/mtu/node.def b/templates/interfaces/tunnel/node.tag/mtu/node.def index 400533f9..44989a92 100644 --- a/templates/interfaces/tunnel/node.tag/mtu/node.def +++ b/templates/interfaces/tunnel/node.tag/mtu/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the tunnel Maximum Transmission Unit (MTU) +help: Maximum Transmission Unit (MTU) syntax:expression: $VAR(@) >= 64 && $VAR(@) <= 8024; "Must be between 64-8024" update: ip link set $VAR(../@) mtu $VAR(@) delete: ip link set $VAR(../@) mtu 1476 diff --git a/templates/interfaces/tunnel/node.tag/multicast/node.def b/templates/interfaces/tunnel/node.tag/multicast/node.def index d7662306..dbe117de 100644 --- a/templates/interfaces/tunnel/node.tag/multicast/node.def +++ b/templates/interfaces/tunnel/node.tag/multicast/node.def @@ -1,5 +1,5 @@ type: txt -help: Set multicast operation over tunnel +help: Multicast operation over tunnel default: "disable" syntax:expression: $VAR(@) in "enable", "disable"; \ diff --git a/templates/interfaces/tunnel/node.tag/remote-ip/node.def b/templates/interfaces/tunnel/node.tag/remote-ip/node.def index 6468f5fc..30f4e4d4 100644 --- a/templates/interfaces/tunnel/node.tag/remote-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/remote-ip/node.def @@ -1,5 +1,5 @@ type: ipv4 -help: Set the remote IP address for this tunnel [REQUIRED] +help: Remote IP address for this tunnel [REQUIRED] create:expression: "true" update:expression: "false" ; \ "Remote IP can only be set at tunnel creation for $VAR(../@)" diff --git a/templates/interfaces/tunnel/node.tag/tos/node.def b/templates/interfaces/tunnel/node.tag/tos/node.def index 58a4cee0..d276319b 100644 --- a/templates/interfaces/tunnel/node.tag/tos/node.def +++ b/templates/interfaces/tunnel/node.tag/tos/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the tunnel Type of Service (TOS) +help: Type of Service (TOS) syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 99; "Must be between 0-99" update: ip tunnel change $VAR(../@) tos $VAR(@) delete: ip tunnel change $VAR(../@) tos inherit diff --git a/templates/interfaces/tunnel/node.tag/ttl/node.def b/templates/interfaces/tunnel/node.tag/ttl/node.def index cfab7264..6e5f5f4f 100644 --- a/templates/interfaces/tunnel/node.tag/ttl/node.def +++ b/templates/interfaces/tunnel/node.tag/ttl/node.def @@ -1,6 +1,6 @@ type: u32 default: 255 -help: Set the tunnel time to live field +help: Time to live field comp_help: possible completions: <0-255> Set time to live (default 255) syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" |