diff options
115 files changed, 117 insertions, 117 deletions
diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def index 23b1262f..52188386 100644 --- a/templates/interfaces/bridge/node.tag/address/node.def +++ b/templates/interfaces/bridge/node.tag/address/node.def @@ -1,11 +1,11 @@ multi: type: txt -help: Configure an IP address for this interface +help: Set an IP address for this interface syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)"; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)" update:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@)"; "Error setting address $VAR(@) on interface $VAR(../@)" delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@)"; "Error deleting address $VAR(@) on interface $VAR(../@)" allowed: echo "dhcp <>" comp_help:Possible completions: - <IP address>/<prefix length>\tSet the IP address and prefix length + <x.x.x.x/x> Set the IP address and prefix length dhcp\t\t\t\tSet the IP address and prefix length via DHCP diff --git a/templates/interfaces/bridge/node.tag/description/node.def b/templates/interfaces/bridge/node.tag/description/node.def index d01f83a7..50250a24 100644 --- a/templates/interfaces/bridge/node.tag/description/node.def +++ b/templates/interfaces/bridge/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Add a human-readable description of an interface +help: Set a description of the interface 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 c6d2934a..72b3273f 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def @@ -1,5 +1,5 @@ type: txt -help: Add this interface to a bridge-group +help: Set this interface to a bridge-group syntax:expression: exec " \ if [ -z \"`sudo brctl show | grep $VAR(@) `\" ]; then \ echo bridge interface $VAR(@) doesn\\'t exist on this system ; \ diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/node.def index 3cc92cd0..0ac61a19 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/node.def @@ -1,4 +1,4 @@ -help: Add this interface to a bridge group +help: Set this interface to a bridge group commit:expression: $VAR(./bridge/) != ""; "Must set the bridge interface" create:expression: "sudo brctl addif $VAR(./bridge/@) $VAR(../@)" delete:expression: "touch /tmp/eth-$VAR(../@)-bridge.$PPID" 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 9c65ff16..e3674bcd 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,5 +1,5 @@ type: txt -help: Add this interface to a bridge-group +help: Set this interface to a bridge-group syntax:expression: exec " \ if [ -z \"`sudo brctl show | grep $VAR(@) `\" ]; then \ echo bridge interface $VAR(@) doesn\\'t exist on this system ; \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def index af1c0e85..45be5f48 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def @@ -1,4 +1,4 @@ -help: Add this interface to a bridge group +help: Set this interface to a bridge group commit:expression: $VAR(./bridge/) != ""; "Must set the bridge interface" create:expression: "sudo brctl addif $VAR(./bridge/@) $VAR(../../@).$VAR(../@)" delete:expression: "touch /tmp/eth-$VAR(../@)-bridge.$PPID" 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 e4892540..26fdf457 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 VRRP +help: Configure Virtual Router Redundancy Protocol (VRRP) parameters commit:expression: $VAR(../address/) != ""; "Must define a primary IP address on $VAR(../../@) vif $VAR(../@)" 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 d59bf682..d87ad6b7 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: Configure VRRP group number +help: Set 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 f033aa5d..59f2b451 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: Configure advertise interval +help: Set 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 8e924a0e..adf78b3f 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: Configure authentication +help: Set 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 63f1bc32..9bd2e98d 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: Password text +help: Set 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 d8e157d3..b531afee 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: Authentication type +help: Set authentication type syntax:expression: $VAR(@) in "plaintext-password", "ah"; \ "authentication must be simple 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 835ad401..aeb40f0b 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: Description for this interface +help: Set description for this interface diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/node.def index 95761590..240924db 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/node.def @@ -1 +1 @@ -help: VRRP configuration for this VRRP group +help: Set VRRP parameters for this VRRP group 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 c3dc66cd..7b3b9cbd 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: Preempt mode +help: Set 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 504eebc4..54de02c7 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: Priority +help: Set 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 8c323f0a..44be2a7f 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: specify an executable script to run on vrrp state-transition to backup +help: Set an executable 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 57f53ae9..9f2557b3 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: specify an executable script to run on vrrp state-transition to fault +help: Set an executable 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 14e484d9..7f7d8895 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: specify an executable script to run on vrrp state-transition to master +help: Set an executable 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 e47f7444..ed959156 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: Specify scripts for vrrp state-transitions +help: Set 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 a7d2e1fd..9602a842 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: Add this vrrp group to a sync group +help: Set to 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 c40c5f47..d4e5aac5 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: ipv4 -help: Configure virtual address +help: Set virtual address create: sudo /opt/vyatta/sbin/vyatta-watchlink-exclude.pl --id=vrrp --action=add --intf="$VAR(../../../../@).$VAR(../../../@)" --ipadd=$VAR(@) --signal diff --git a/templates/interfaces/ethernet/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vrrp/node.def index 05cfb986..d88c9745 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 VRRP +help: Configure Virtual Router Redundancy Protocol (VRRP) commit:expression: $VAR(../address/) != ""; "Must define a primary IP address on $VAR(../@)" 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 90bf0d5c..a3ce1395 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: Configure VRRP group number +help: Set 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 f033aa5d..59f2b451 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: Configure advertise interval +help: Set 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 8e924a0e..adf78b3f 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: Configure authentication +help: Set 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 63f1bc32..9bd2e98d 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: Password text +help: Set 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 32a802d5..1547d62c 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: Authentication type +help: Set authentication type syntax:expression: $VAR(@) in "plaintext-password", "ah"; \ "authentication must be simple 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 835ad401..aeb40f0b 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: Description for this interface +help: Set description for this interface diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/node.def index 95761590..240924db 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/node.def @@ -1 +1 @@ -help: VRRP configuration for this VRRP group +help: Set VRRP parameters for this VRRP group 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 c3dc66cd..4ed282ed 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: Preempt mode +help: Set 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 504eebc4..54de02c7 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: Priority +help: Set 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 8c323f0a..44be2a7f 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: specify an executable script to run on vrrp state-transition to backup +help: Set an executable 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 57f53ae9..9f2557b3 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: specify an executable script to run on vrrp state-transition to fault +help: Set an executable 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 14e484d9..7f7d8895 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: specify an executable script to run on vrrp state-transition to master +help: Set an executable 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 e47f7444..3abc1696 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: Specify scripts for vrrp state-transitions +help: Set 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 a7d2e1fd..9602a842 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: Add this vrrp group to a sync group +help: Set to 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 af8b4624..2f94aef9 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: ipv4 -help: Configure virtual address +help: Set virtual address create: sudo /opt/vyatta/sbin/vyatta-watchlink-exclude.pl --id=vrrp --action=add --intf=$VAR(../../../@) --ipadd=$VAR(@) --signal diff --git a/templates/interfaces/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def index 4d91c9ba..07ea4a0e 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: Configure an IP address for this interface +help: Set an IP address for this interface syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)"; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)" @@ -9,4 +9,4 @@ update:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@)"; "Error deleting address $VAR(@) on interface $VAR(../@)" comp_help:Possible completions: - <IP address>/<prefix length> Set the IP address and prefix length + <x.x.x.x/x> Set the IP address and prefix length diff --git a/templates/interfaces/tunnel/node.tag/description/node.def b/templates/interfaces/tunnel/node.tag/description/node.def index e00ed857..b53ae684 100644 --- a/templates/interfaces/tunnel/node.tag/description/node.def +++ b/templates/interfaces/tunnel/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Description of this tunnel interface +help: Set description of this tunnel interface diff --git a/templates/interfaces/tunnel/node.tag/local-ip/node.def b/templates/interfaces/tunnel/node.tag/local-ip/node.def index 6cdaf2a5..d40417a8 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: Enter the local IP address for this tunnel +help: Set the local IP address for this tunnel syntax:expression: exec "if [ -z \"`ip addr list | grep $VAR(@) `\" ]; then \ echo IP address $VAR(@) doesn\\'t exist on this system ; \ exit 1 ; \ diff --git a/templates/interfaces/tunnel/node.tag/mtu/node.def b/templates/interfaces/tunnel/node.tag/mtu/node.def index 47dc34cf..f1fdf39b 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 MTU +help: Set the tunnel Maximum Transmission Unit (MTU) syntax:expression: $VAR(@) >= 64 && $VAR(@) <= 8024; "Must be between 64-8024" update:expression: "sudo ip link set $VAR(../@) mtu $VAR(@)" delete:expression: "sudo ip link set $VAR(../@) mtu 1476" diff --git a/templates/interfaces/tunnel/node.tag/remote-ip/node.def b/templates/interfaces/tunnel/node.tag/remote-ip/node.def index e5ee1ffd..7bdb4725 100644 --- a/templates/interfaces/tunnel/node.tag/remote-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/remote-ip/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: Enter the remote IP address for this tunnel +help: Set the remote IP address for this tunnel diff --git a/templates/interfaces/tunnel/node.tag/tos/node.def b/templates/interfaces/tunnel/node.tag/tos/node.def index 8cc69360..1f739966 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 +help: Set the tunnel Type of Service (TOS) syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 99; "Must be between 0-99" update:expression: "sudo ip tunnel change $VAR(../@) tos $VAR(@)" delete:expression: "sudo 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 1d194508..298c4d61 100644 --- a/templates/interfaces/tunnel/node.tag/ttl/node.def +++ b/templates/interfaces/tunnel/node.tag/ttl/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the tunnel time to live +help: Set the tunnel time to live field default: 255 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" update:expression: "sudo ip tunnel change $VAR(../@) ttl $VAR(@)" diff --git a/templates/protocols/snmp/community/node.def b/templates/protocols/snmp/community/node.def index 07bedcd1..6dd23349 100644 --- a/templates/protocols/snmp/community/node.def +++ b/templates/protocols/snmp/community/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: Community name +help: Set community name diff --git a/templates/protocols/snmp/community/node.tag/authorization/node.def b/templates/protocols/snmp/community/node.tag/authorization/node.def index 005e9b39..c8918d43 100644 --- a/templates/protocols/snmp/community/node.tag/authorization/node.def +++ b/templates/protocols/snmp/community/node.tag/authorization/node.def @@ -1,6 +1,6 @@ type: txt default: "ro" -help: Authorization type (rw or ro) +help: Set authorization type (rw or ro) (default: ro) syntax:expression: $VAR(@) in "ro", "rw"; "Authorization type must be either rw or ro" diff --git a/templates/protocols/snmp/community/node.tag/client/node.def b/templates/protocols/snmp/community/node.tag/client/node.def index 134698ef..828faa97 100644 --- a/templates/protocols/snmp/community/node.tag/client/node.def +++ b/templates/protocols/snmp/community/node.tag/client/node.def @@ -1,3 +1,3 @@ multi: type: ipv4 -help: IP address of SNMP client allowed to contact system +help: Set IP address of SNMP client allowed to contact system diff --git a/templates/protocols/snmp/community/node.tag/network/node.def b/templates/protocols/snmp/community/node.tag/network/node.def index 1afdb2a1..00a77d4b 100644 --- a/templates/protocols/snmp/community/node.tag/network/node.def +++ b/templates/protocols/snmp/community/node.tag/network/node.def @@ -1,4 +1,4 @@ multi: type: ipv4net -help: Subnet of SNMP client(s) allowed to contact system +help: Set subnet of SNMP client(s) allowed to contact system syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)" diff --git a/templates/protocols/snmp/community/node.tag/node.def b/templates/protocols/snmp/community/node.tag/node.def index 20430928..dd44d5ec 100644 --- a/templates/protocols/snmp/community/node.tag/node.def +++ b/templates/protocols/snmp/community/node.tag/node.def @@ -1 +1 @@ -help: Community options +help: Set community options diff --git a/templates/protocols/snmp/contact/node.def b/templates/protocols/snmp/contact/node.def index 039cd548..4251291e 100644 --- a/templates/protocols/snmp/contact/node.def +++ b/templates/protocols/snmp/contact/node.def @@ -1,2 +1,2 @@ type: txt -help: Contact information +help: Set contact information diff --git a/templates/protocols/snmp/description/node.def b/templates/protocols/snmp/description/node.def index 61ec96b6..6324a96b 100644 --- a/templates/protocols/snmp/description/node.def +++ b/templates/protocols/snmp/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Description information +help: Set description information diff --git a/templates/protocols/snmp/location/node.def b/templates/protocols/snmp/location/node.def index a5b234ea..f4bcef7c 100644 --- a/templates/protocols/snmp/location/node.def +++ b/templates/protocols/snmp/location/node.def @@ -1,3 +1,3 @@ type: txt -help: Location information +help: Set location information diff --git a/templates/protocols/snmp/node.def b/templates/protocols/snmp/node.def index 62adc534..3612f2b6 100644 --- a/templates/protocols/snmp/node.def +++ b/templates/protocols/snmp/node.def @@ -1,4 +1,4 @@ -help: Configure SNMP +help: Configure Simple Network Management Protocol (SNMP) commit:expression: $VAR(community/) != ""; "must configure a community" create:expression: "/opt/vyatta/sbin/vyatta-snmp.pl --init-snmp" delete:expression: "touch /tmp/snmp.$PPID" diff --git a/templates/protocols/snmp/trap-target/node.def b/templates/protocols/snmp/trap-target/node.def index bfb450fd..c041d108 100644 --- a/templates/protocols/snmp/trap-target/node.def +++ b/templates/protocols/snmp/trap-target/node.def @@ -1,3 +1,3 @@ multi: type: ipv4 -help: IPv4 address of trap target +help: Set IP address of trap target diff --git a/templates/service/node.def b/templates/service/node.def index f2dbf0c6..a2441db9 100644 --- a/templates/service/node.def +++ b/templates/service/node.def @@ -1 +1 @@ -help: Service configuration +help: Configure specified service diff --git a/templates/service/ssh/node.def b/templates/service/ssh/node.def index a16f5d15..fbb29687 100644 --- a/templates/service/ssh/node.def +++ b/templates/service/ssh/node.def @@ -1,4 +1,4 @@ -help: Enable/disable SSH protocol +help: Enable/disable Secure SHell (SSH) protocol delete:expression: "sudo /usr/sbin/invoke-rc.d ssh stop && \ sudo sh -c \"echo 'SSHD_OPTS=' > /etc/default/ssh\" " end:expression: "if [ -z \"$VAR(port/@)\" ]; then exit 0; fi; \ diff --git a/templates/service/ssh/port/node.def b/templates/service/ssh/port/node.def index 1b1248f4..db07b07a 100644 --- a/templates/service/ssh/port/node.def +++ b/templates/service/ssh/port/node.def @@ -1,3 +1,3 @@ type: u32 default: 22 -help: Port for SSH service +help: Set port for SSH service diff --git a/templates/service/ssh/protocol-version/node.def b/templates/service/ssh/protocol-version/node.def index a4efc602..051ea062 100644 --- a/templates/service/ssh/protocol-version/node.def +++ b/templates/service/ssh/protocol-version/node.def @@ -1,3 +1,3 @@ type: txt default: "v2" -help: SSH version +help: Set SSH version (default: v2) diff --git a/templates/service/telnet/node.def b/templates/service/telnet/node.def index a1cc9680..5976addd 100644 --- a/templates/service/telnet/node.def +++ b/templates/service/telnet/node.def @@ -1,4 +1,4 @@ -help: Enable/disable telnet protocol +help: Enable/disable Network Virtual Terminal Protocol (TELNET) protocol delete:expression: " \ if ! env | grep -q SSH_TTY=; then \ if [[ \"`tty`\" == /dev/pts/* ]]; then \ diff --git a/templates/service/telnet/port/node.def b/templates/service/telnet/port/node.def index 81b2ff91..2613f413 100644 --- a/templates/service/telnet/port/node.def +++ b/templates/service/telnet/port/node.def @@ -1,3 +1,3 @@ type: u32 default: 23 -help: Port for telnet service +help: Set port for TELNET service diff --git a/templates/system/domain-name/node.def b/templates/system/domain-name/node.def index 9101f2f3..2ddc8e44 100644 --- a/templates/system/domain-name/node.def +++ b/templates/system/domain-name/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure system domain name +help: Set system domain name syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]{0,63}$" ; "invalid domain name $VAR(@)" # also add localhost line into /etc/hosts (see host-name template)? diff --git a/templates/system/domain-search/domain/node.def b/templates/system/domain-search/domain/node.def index bd3e51bf..8af03fa4 100644 --- a/templates/system/domain-search/domain/node.def +++ b/templates/system/domain-search/domain/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Configure DNS domain completion order +help: Set DNS domain completion order syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]+$" ; "invalid domain name $VAR(@)" update:expression: "sudo /opt/vyatta/sbin/vyatta_update_resolv.pl" delete:expression: "sudo /opt/vyatta/sbin/vyatta_update_resolv.pl" diff --git a/templates/system/domain-search/node.def b/templates/system/domain-search/node.def index ce28442d..b51158e6 100644 --- a/templates/system/domain-search/node.def +++ b/templates/system/domain-search/node.def @@ -1 +1 @@ -help: Configure DNS domain completion order +help: Set Domain Name Server (DNS) domain completion order diff --git a/templates/system/host-name/node.def b/templates/system/host-name/node.def index 1aba2174..97b9f9a6 100644 --- a/templates/system/host-name/node.def +++ b/templates/system/host-name/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure system host name +help: Set system host name (default: vyatta) default: "vyatta" syntax:expression: pattern $VAR(@) "^[[:alpha:]][-.[:alnum:]]*[[:alnum:]]$" ; "invalid host name $VAR(@)" diff --git a/templates/system/login/node.def b/templates/system/login/node.def index d98c03c6..62e693e2 100644 --- a/templates/system/login/node.def +++ b/templates/system/login/node.def @@ -1,3 +1,3 @@ -help: Configure user access +help: Set user access delete:expression: "echo User root cannot be deleted 1>&2 && exit 1" end: /opt/vyatta/sbin/vyatta_update_login.pl diff --git a/templates/system/login/radius-server/node.def b/templates/system/login/radius-server/node.def index 85ca4cc5..137a92a0 100644 --- a/templates/system/login/radius-server/node.def +++ b/templates/system/login/radius-server/node.def @@ -1,6 +1,6 @@ tag: type: ipv4 -help: Radius server authentication configuration +help: Set radius server authentication commit:expression: $VAR(port) != "" && $VAR(secret) != "" && $VAR(timeout) != "" ; "Port, secret, and timeout must be specified for Radius" diff --git a/templates/system/login/radius-server/node.tag/port/node.def b/templates/system/login/radius-server/node.tag/port/node.def index 002bc8a0..a0873552 100644 --- a/templates/system/login/radius-server/node.tag/port/node.def +++ b/templates/system/login/radius-server/node.tag/port/node.def @@ -1,4 +1,4 @@ type: u32 -help: Configure radius port +help: Set radius port syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535" default: 1812 diff --git a/templates/system/login/radius-server/node.tag/secret/node.def b/templates/system/login/radius-server/node.tag/secret/node.def index 71176843..6ed802ef 100644 --- a/templates/system/login/radius-server/node.tag/secret/node.def +++ b/templates/system/login/radius-server/node.tag/secret/node.def @@ -1,2 +1,2 @@ type: txt -help: Secret for radius access +help: Set secret for radius access diff --git a/templates/system/login/radius-server/node.tag/timeout/node.def b/templates/system/login/radius-server/node.tag/timeout/node.def index 23a964a6..423051d3 100644 --- a/templates/system/login/radius-server/node.tag/timeout/node.def +++ b/templates/system/login/radius-server/node.tag/timeout/node.def @@ -1,3 +1,3 @@ type: u32 -help: Timeout for radius session +help: Set timeout for radius session default: 2 diff --git a/templates/system/login/user/node.def b/templates/system/login/user/node.def index 205a4b7a..d23a397f 100644 --- a/templates/system/login/user/node.def +++ b/templates/system/login/user/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: User account information +help: Set user account information commit:expression: $VAR(authentication/encrypted-password) != "" || ($VAR(authentication/plaintext-password) != "" && $VAR(authentication/plaintext-password/@) != "") diff --git a/templates/system/login/user/node.tag/authentication/encrypted-password/node.def b/templates/system/login/user/node.tag/authentication/encrypted-password/node.def index cd800ce4..3c12bdc3 100644 --- a/templates/system/login/user/node.tag/authentication/encrypted-password/node.def +++ b/templates/system/login/user/node.tag/authentication/encrypted-password/node.def @@ -1,2 +1,2 @@ type: txt -help: Configure encrypted password +help: Set encrypted password diff --git a/templates/system/login/user/node.tag/authentication/node.def b/templates/system/login/user/node.tag/authentication/node.def index 4306d008..488acd8c 100644 --- a/templates/system/login/user/node.tag/authentication/node.def +++ b/templates/system/login/user/node.tag/authentication/node.def @@ -1 +1 @@ -help: Authentication password +help: Set authentication password diff --git a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def index 1ac3c203..4f309e72 100644 --- a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def +++ b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure plaintext password for encryption +help: Sete plaintext password for encryption # if plaintext is empty, assume this is left-over from blanking the plaintext # and do nothing. to set password to empty, user needs to set the # "encrypted-password" to an empty string (which actually allows login without diff --git a/templates/system/login/user/node.tag/full-name/node.def b/templates/system/login/user/node.tag/full-name/node.def index 42d9dfac..c3cba58b 100644 --- a/templates/system/login/user/node.tag/full-name/node.def +++ b/templates/system/login/user/node.tag/full-name/node.def @@ -1,3 +1,3 @@ type: txt -help: Full name of the user (use quotes for names with spaces) +help: Set full name of the user (use quotes for names with spaces) syntax:expression: pattern $VAR(@) "^[^:]*$"; "Cannot use ':' in full name" diff --git a/templates/system/login/user/node.tag/level/node.def b/templates/system/login/user/node.tag/level/node.def index 2596bd7a..d64a6441 100644 --- a/templates/system/login/user/node.tag/level/node.def +++ b/templates/system/login/user/node.tag/level/node.def @@ -1,5 +1,5 @@ type: txt -help: User privilege level +help: Set user privilege level default: "admin" syntax:expression: $VAR(@) in "admin", "operator"; "Allowed levels are \"admin\" and \"operator\"" comp_help:Possible completions: diff --git a/templates/system/name-server/node.def b/templates/system/name-server/node.def index 7b688a37..0ed43351 100644 --- a/templates/system/name-server/node.def +++ b/templates/system/name-server/node.def @@ -1,6 +1,6 @@ multi: type: ipv4 -help: Configure domain name server +help: Set Domain Name Server (DNS) update:expression: "sudo sh -c \"touch /etc/resolv.conf && \ if grep -q '$VAR(@)' /etc/resolv.conf; then \ exit 0; \ diff --git a/templates/system/node.def b/templates/system/node.def index 3f4d0643..3e437873 100644 --- a/templates/system/node.def +++ b/templates/system/node.def @@ -1 +1 @@ -help: System configuration +help: Configure system parameters diff --git a/templates/system/ntp-server/node.def b/templates/system/ntp-server/node.def index e61ef918..485cf774 100644 --- a/templates/system/ntp-server/node.def +++ b/templates/system/ntp-server/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Name or IP address of NTP server +help: Set name or IP address of Network Time Protocol (NTP) server update:sudo sh -c \ "touch /etc/ntp.conf if ! grep -q 'server.*$VAR(@)' /etc/ntp.conf; then diff --git a/templates/system/options/node.def b/templates/system/options/node.def index 005684e6..96cb8037 100644 --- a/templates/system/options/node.def +++ b/templates/system/options/node.def @@ -1 +1 @@ -help: Configure system options +help: Set system options diff --git a/templates/system/options/reboot-on-panic/node.def b/templates/system/options/reboot-on-panic/node.def index d16df48c..f75f4c68 100644 --- a/templates/system/options/reboot-on-panic/node.def +++ b/templates/system/options/reboot-on-panic/node.def @@ -1,5 +1,5 @@ type: bool -help: Configure if kernel panic causes reboot +help: Set if kernel panic causes reboot default: true update:expression: "sudo sh -c \"if [ x$VAR(@) == xfalse ]; \ then \ diff --git a/templates/system/package/auto-sync/node.def b/templates/system/package/auto-sync/node.def index 9300848e..3d14ab04 100644 --- a/templates/system/package/auto-sync/node.def +++ b/templates/system/package/auto-sync/node.def @@ -3,7 +3,7 @@ # the /etc/crontab file must have the daily line for daily to be run type: u32 default: 1 -help: Update the the repository cache every n days. 0 disables auto-update. +help: Set to update the the repository cache every n days (0 disables auto-update) syntax:expression: $VAR(@) >= 0 && $VAR(@) < 32 ; "auto-sync must be between 0 and 32 days" update:expression: "sudo sh -c \"touch /etc/apt/apt.conf && \ sed -i '/APT::Periodic::Update-Package-Lists*/d' /etc/apt/apt.conf && \ diff --git a/templates/system/package/node.def b/templates/system/package/node.def index 3330033a..f0debd11 100644 --- a/templates/system/package/node.def +++ b/templates/system/package/node.def @@ -1 +1 @@ -help: Package Update Repository Configuration +help: Set package update repository parameters diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def index d2e4cf38..8d753918 100644 --- a/templates/system/package/repository/node.def +++ b/templates/system/package/repository/node.def @@ -2,7 +2,7 @@ tag: type: txt -help: Name a debian archive +help: Set name of a debian archive commit:expression: $VAR(./url/) != ""; "Must configure the repository URL" commit:expression: $VAR(./distribution/) != ""; "Must configure the repository distribution" diff --git a/templates/system/package/repository/node.tag/components/node.def b/templates/system/package/repository/node.tag/components/node.def index 51ab9580..60605b89 100644 --- a/templates/system/package/repository/node.tag/components/node.def +++ b/templates/system/package/repository/node.tag/components/node.def @@ -1,4 +1,4 @@ type: txt -help: Repository component names +help: Set repository component names # need to prohibit '!' in repo name (sed delimiter) syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in component name" diff --git a/templates/system/package/repository/node.tag/description/node.def b/templates/system/package/repository/node.tag/description/node.def index e187f9e4..8ebfacb0 100644 --- a/templates/system/package/repository/node.tag/description/node.def +++ b/templates/system/package/repository/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Repository description +help: Set repository description diff --git a/templates/system/package/repository/node.tag/distribution/node.def b/templates/system/package/repository/node.tag/distribution/node.def index 39235a6a..ce5219bc 100644 --- a/templates/system/package/repository/node.tag/distribution/node.def +++ b/templates/system/package/repository/node.tag/distribution/node.def @@ -1,4 +1,4 @@ type: txt -help: Distribution name +help: Set distribution name # need to prohibit '!' in repo name (sed delimiter) syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in distribution name" diff --git a/templates/system/package/repository/node.tag/url/node.def b/templates/system/package/repository/node.tag/url/node.def index 7c84afce..9cb3a472 100644 --- a/templates/system/package/repository/node.tag/url/node.def +++ b/templates/system/package/repository/node.tag/url/node.def @@ -1,4 +1,4 @@ type: txt -help: Repository URL +help: Set repository URL # need to prohibit '!' in url (sed delimiter) syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in url" diff --git a/templates/system/static-host-mapping/host-name/node.def b/templates/system/static-host-mapping/host-name/node.def index 99f66fb7..189025e3 100644 --- a/templates/system/static-host-mapping/host-name/node.def +++ b/templates/system/static-host-mapping/host-name/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Map DNS names to system interfaces +help: Set to map DNS names to system interfaces syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]+$" ; "invalid host name $VAR(@)" commit:expression: $VAR(./inet) != ""; "IP address for the static mapping must be set" end:expression: "sudo sh -c \"\ diff --git a/templates/system/static-host-mapping/host-name/node.tag/alias/node.def b/templates/system/static-host-mapping/host-name/node.tag/alias/node.def index 2f340fc7..7b07ff1a 100644 --- a/templates/system/static-host-mapping/host-name/node.tag/alias/node.def +++ b/templates/system/static-host-mapping/host-name/node.tag/alias/node.def @@ -1,3 +1,3 @@ multi: type: txt -help: Alias for this address +help: Set alias for this address diff --git a/templates/system/static-host-mapping/host-name/node.tag/inet/node.def b/templates/system/static-host-mapping/host-name/node.tag/inet/node.def index 727c0411..dff601a5 100644 --- a/templates/system/static-host-mapping/host-name/node.tag/inet/node.def +++ b/templates/system/static-host-mapping/host-name/node.tag/inet/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: Internet address +help: Set Internet address diff --git a/templates/system/static-host-mapping/node.def b/templates/system/static-host-mapping/node.def index e72527ae..0eeace02 100644 --- a/templates/system/static-host-mapping/node.def +++ b/templates/system/static-host-mapping/node.def @@ -1 +1 @@ -help: Map DNS names to system interfaces +help: Set to map DNS names to system interfaces diff --git a/templates/system/syslog/console/facility/node.def b/templates/system/syslog/console/facility/node.def index 26b736cf..fa44b2f2 100644 --- a/templates/system/syslog/console/facility/node.def +++ b/templates/system/syslog/console/facility/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Configure facility for console logging +help: Set facility for console logging syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility" update:expression: "sudo sh -c \"LVL=`echo -n $VAR(level/@) | tr '[a-z]' '[A-Z]'` && \ FAC='$VAR(@)' ; if [ x\\$FAC == xall ]; then FAC='*'; fi && \ diff --git a/templates/system/syslog/console/facility/node.tag/level/node.def b/templates/system/syslog/console/facility/node.tag/level/node.def index d690ecd2..42e6c148 100644 --- a/templates/system/syslog/console/facility/node.tag/level/node.def +++ b/templates/system/syslog/console/facility/node.tag/level/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure the logging level +help: Set the logging level syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level" default: "err" comp_help:Logging levels in descending order of severity: diff --git a/templates/system/syslog/console/node.def b/templates/system/syslog/console/node.def index b4a2fc3b..ec620885 100644 --- a/templates/system/syslog/console/node.def +++ b/templates/system/syslog/console/node.def @@ -1 +1 @@ -help: Configure console logging +help: Set console logging diff --git a/templates/system/syslog/file/node.def b/templates/system/syslog/file/node.def index fa4fd7d0..e2c7759f 100644 --- a/templates/system/syslog/file/node.def +++ b/templates/system/syslog/file/node.def @@ -1,5 +1,5 @@ tag: type: txt -help: Name of the syslog file to save log messages to +help: Set the name of syslog file to save log messages to syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9_.]+$" ; "invalid file name $VAR(@)" commit:expression: $VAR(./facility/) != "" || $VAR(./archive/) != ""; "Must specify either facility or archive for syslog file" diff --git a/templates/system/syslog/file/node.tag/archive/files/node.def b/templates/system/syslog/file/node.tag/archive/files/node.def index 86fc3808..59869a51 100644 --- a/templates/system/syslog/file/node.tag/archive/files/node.def +++ b/templates/system/syslog/file/node.tag/archive/files/node.def @@ -1,3 +1,3 @@ type: u32 -help: Number of saved files +help: Set number of saved files default: 5 diff --git a/templates/system/syslog/file/node.tag/archive/node.def b/templates/system/syslog/file/node.tag/archive/node.def index 002003f4..ad1d239f 100644 --- a/templates/system/syslog/file/node.tag/archive/node.def +++ b/templates/system/syslog/file/node.tag/archive/node.def @@ -1,4 +1,4 @@ -help: Configure log file size and rotation characteristics +help: Set log file size and rotation characteristics # need mandatory files & size update:expression: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_logrotate.pl \ '$VAR(../@)' '$VAR(files/@)' '$VAR(size/@)' 1\" " diff --git a/templates/system/syslog/file/node.tag/archive/size/node.def b/templates/system/syslog/file/node.tag/archive/size/node.def index 57955185..11cde386 100644 --- a/templates/system/syslog/file/node.tag/archive/size/node.def +++ b/templates/system/syslog/file/node.tag/archive/size/node.def @@ -1,3 +1,3 @@ type: u32 -help: Size of log files (kbytes) +help: Set size of log files (kbytes) default: 0 diff --git a/templates/system/syslog/file/node.tag/facility/node.def b/templates/system/syslog/file/node.tag/facility/node.def index 7711d6a0..bfa6341d 100644 --- a/templates/system/syslog/file/node.tag/facility/node.def +++ b/templates/system/syslog/file/node.tag/facility/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Configure facility for file logging +help: Set facility for file logging syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility" update:expression: "sudo sh -c \"LVL=`echo -n $VAR(level/@) | tr '[a-z]' '[A-Z]'` && \ FAC='$VAR(@)' ; if [ x\\$FAC == xall ]; then FAC='*'; fi && \ diff --git a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def index dd03ec9d..a8eaa0e6 100644 --- a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def +++ b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure the logging level +help: Set the logging level syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level" default: "err" comp_help:Logging levels in descending order of severity: diff --git a/templates/system/syslog/global/archive/files/node.def b/templates/system/syslog/global/archive/files/node.def index 86fc3808..59869a51 100644 --- a/templates/system/syslog/global/archive/files/node.def +++ b/templates/system/syslog/global/archive/files/node.def @@ -1,3 +1,3 @@ type: u32 -help: Number of saved files +help: Set number of saved files default: 5 diff --git a/templates/system/syslog/global/archive/node.def b/templates/system/syslog/global/archive/node.def index 3691bbe0..17d6c996 100644 --- a/templates/system/syslog/global/archive/node.def +++ b/templates/system/syslog/global/archive/node.def @@ -1,4 +1,4 @@ -help: Configure log file size and rotation characteristics +help: Set log file size and rotation characteristics # need mandatory files & size update:expression: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_logrotate.pl \ '$VAR(files/@)' '$VAR(size/@)' 1\" " diff --git a/templates/system/syslog/global/archive/size/node.def b/templates/system/syslog/global/archive/size/node.def index c02fd0f1..bf83546f 100644 --- a/templates/system/syslog/global/archive/size/node.def +++ b/templates/system/syslog/global/archive/size/node.def @@ -1,3 +1,3 @@ type: u32 -help: Size of log files (kbytes) +help: Set size of log files (kbytes) default: 250 diff --git a/templates/system/syslog/global/facility/node.def b/templates/system/syslog/global/facility/node.def index 1fdaad00..cff98650 100644 --- a/templates/system/syslog/global/facility/node.def +++ b/templates/system/syslog/global/facility/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Configure facility for system logging +help: Set facility for system logging syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility" update:expression: "sudo sh -c \"LVL=`echo -n $VAR(level/@) | tr '[a-z]' '[A-Z]'` && \ FAC='$VAR(@)' ; if [ x\\$FAC == xall ]; then FAC='*'; fi && \ diff --git a/templates/system/syslog/global/facility/node.tag/level/node.def b/templates/system/syslog/global/facility/node.tag/level/node.def index d690ecd2..42e6c148 100644 --- a/templates/system/syslog/global/facility/node.tag/level/node.def +++ b/templates/system/syslog/global/facility/node.tag/level/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure the logging level +help: Set the logging level syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level" default: "err" comp_help:Logging levels in descending order of severity: diff --git a/templates/system/syslog/global/node.def b/templates/system/syslog/global/node.def index 5fcf45b8..175d85e1 100644 --- a/templates/system/syslog/global/node.def +++ b/templates/system/syslog/global/node.def @@ -1 +1 @@ -help: Configure system logging +help: Set system logging diff --git a/templates/system/syslog/host/node.def b/templates/system/syslog/host/node.def index 5f669a59..0e757cbc 100644 --- a/templates/system/syslog/host/node.def +++ b/templates/system/syslog/host/node.def @@ -1,3 +1,3 @@ tag: type: txt -help: IP address or hostname of remote syslog server +help: Set IP address or hostname of remote syslog server diff --git a/templates/system/syslog/host/node.tag/facility/node.def b/templates/system/syslog/host/node.tag/facility/node.def index 04b32e2e..c91a6df8 100644 --- a/templates/system/syslog/host/node.tag/facility/node.def +++ b/templates/system/syslog/host/node.tag/facility/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Configure facility for host logging +help: Set facility for host logging syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility" update:expression: "sudo sh -c \"LVL=`echo -n $VAR(level/@) | tr '[a-z]' '[A-Z]'` && \ FAC='$VAR(@)' ; if [ x\\$FAC == xall ]; then FAC='*'; fi && \ diff --git a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def index d690ecd2..42e6c148 100644 --- a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def +++ b/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure the logging level +help: Set the logging level syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level" default: "err" comp_help:Logging levels in descending order of severity: diff --git a/templates/system/syslog/node.def b/templates/system/syslog/node.def index 012a71ba..72a82d78 100644 --- a/templates/system/syslog/node.def +++ b/templates/system/syslog/node.def @@ -1,3 +1,3 @@ -help: Configure syslog daemon +help: Set syslog daemon delete:expression: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_syslog.pl \ '' '\\/var\\/log\\/messages' '*.warning\t/var/log/messages \n'\" " diff --git a/templates/system/syslog/user/node.def b/templates/system/syslog/user/node.def index df0c4e6f..a432f326 100644 --- a/templates/system/syslog/user/node.def +++ b/templates/system/syslog/user/node.def @@ -1,5 +1,5 @@ tag: type: txt -help: Configure logging to specific user's terminal +help: Set logging to specific user's terminal comp_help: Possible completions: <username> Send log messages to this user's terminal diff --git a/templates/system/syslog/user/node.tag/facility/node.def b/templates/system/syslog/user/node.tag/facility/node.def index 1d349e16..93afe631 100644 --- a/templates/system/syslog/user/node.tag/facility/node.def +++ b/templates/system/syslog/user/node.tag/facility/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Configure facility for user logging +help: Set facility for user logging syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility" update:expression: "sudo sh -c \"LVL=`echo -n $VAR(level/@) | tr '[a-z]' '[A-Z]'` && \ FAC='$VAR(@)' ; if [ x\\$FAC == xall ]; then FAC='*'; fi && \ diff --git a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def index d690ecd2..42e6c148 100644 --- a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def +++ b/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure the logging level +help: Set the logging level syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level" default: "err" comp_help:Logging levels in descending order of severity: diff --git a/templates/system/time-zone/node.def b/templates/system/time-zone/node.def index 450429d0..e271e3e6 100644 --- a/templates/system/time-zone/node.def +++ b/templates/system/time-zone/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure local timezone +help: Set local timezone default: "GMT" update:expression: "LTF=\"/usr/share/zoneinfo\" && \ case \"$VAR(@)\" in \ |