diff options
Diffstat (limited to 'templates/interfaces')
54 files changed, 195 insertions, 195 deletions
diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def index d44c7216..ff643980 100644 --- a/templates/interfaces/bridge/node.def +++ b/templates/interfaces/bridge/node.def @@ -1,7 +1,7 @@ tag: type: txt -help: "Configure a bridge interface" -syntax: $(@) in "br0", "br1", "br2", "br3", "br4", "br5", "br6", "br7", "br8", "br9" ; "Must be (br0 - br9)" -create: "sudo brctl addbr $(@)" -delete: "sudo brctl delbr $(@)" -#comp_help: "Enter bridge interface name (br0 - br9)" +help: Configure a bridge interface +syntax:expression: $VAR(@) in "br0", "br1", "br2", "br3", "br4", "br5", "br6", "br7", "br8", "br9" ; "Must be (br0 - br9)" +create:expression: "sudo brctl addbr $VAR(@)" +delete:expression: "sudo brctl delbr $VAR(@)" +comp_help: "Enter bridge interface name (br0 - br9)" diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def index af198670..410c072b 100644 --- a/templates/interfaces/bridge/node.tag/address/node.def +++ b/templates/interfaces/bridge/node.tag/address/node.def @@ -1,10 +1,10 @@ multi: type: txt -help: "Configure an IP address for this interface" -syntax: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $(@) --dev $(../@)"; "Invalid IP address/prefix [$(@)] for interface $(../@)" -update: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $(@) --dev $(../@)"; "Error setting address $(@) on interface $(../@)" -delete: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $(@) --dev $(../@)"; "Error deleting address $(@) on interface $(../@)" -#comp_help:Possible completions: -# <IP address>/<prefix length>\tSet the IP address and prefix length -# dhcp\t\t\t\tSet the IP address and prefix length via DHCP +help: Configure 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(../@)" +comp_help:Possible completions: + <IP address>/<prefix length>\tSet 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/aging/node.def b/templates/interfaces/bridge/node.tag/aging/node.def index 0b1dcd03..3431f28e 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: Set the number of seconds a MAC address will be kept in the forwarding database default: 300 -update: "sudo brctl setageing $(../@) $(@)" -delete: "sudo brctl setageing $(../@) $(@)" +update:expression: "sudo brctl setageing $VAR(../@) $VAR(@)" +delete:expression: "sudo brctl setageing $VAR(../@) $VAR(@)" diff --git a/templates/interfaces/bridge/node.tag/description/node.def b/templates/interfaces/bridge/node.tag/description/node.def index 481dce47..d01f83a7 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: Add a human-readable description of an interface diff --git a/templates/interfaces/bridge/node.tag/disable/node.def b/templates/interfaces/bridge/node.tag/disable/node.def index f72b8af3..d9d4883e 100644 --- a/templates/interfaces/bridge/node.tag/disable/node.def +++ b/templates/interfaces/bridge/node.tag/disable/node.def @@ -1,8 +1,8 @@ type: bool -help: "Disable the bridge interface" +help: Disable the bridge interface default: false -update: "if [ x$(@) == xtrue ]; then \ - sudo ip link set $(../@) down; \ +update:expression: "if [ x$VAR(@) == xtrue ]; then \ + sudo ip link set $VAR(../@) down; \ else \ - sudo ip link set $(../@) up; \ + sudo ip link set $VAR(../@) up; \ fi; " diff --git a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def index 6634a7cc..3bf3cdda 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: Set the forwarding delay default: 15 -update: "sudo brctl setfd $(../@) $(@)" -delete: "sudo brctl setfd $(../@) $(@)" +update:expression: "sudo brctl setfd $VAR(../@) $VAR(@)" +delete:expression: "sudo brctl setfd $VAR(../@) $VAR(@)" diff --git a/templates/interfaces/bridge/node.tag/hello-time/node.def b/templates/interfaces/bridge/node.tag/hello-time/node.def index e7b59ab3..8128a16d 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: Set the hello packet advertisment interval default: 2 -update: "sudo brctl sethello $(../@) $(@)" -delete: "sudo brctl sethello $(../@) $(@)" +update:expression: "sudo brctl sethello $VAR(../@) $VAR(@)" +delete:expression: "sudo brctl sethello $VAR(../@) $VAR(@)" diff --git a/templates/interfaces/bridge/node.tag/max-age/node.def b/templates/interfaces/bridge/node.tag/max-age/node.def index 7fa3ecbe..1c245ed5 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: Set the interval at which neighbor bridges are removed default: 20 -update: "sudo brctl setmaxage $(../@) $(@)" -delete: "sudo brctl setmaxage $(../@) $(@)" +update:expression: "sudo brctl setmaxage $VAR(../@) $VAR(@)" +delete:expression: "sudo brctl setmaxage $VAR(../@) $VAR(@)" diff --git a/templates/interfaces/bridge/node.tag/node.def b/templates/interfaces/bridge/node.tag/node.def index 07e13e91..b265ba49 100644 --- a/templates/interfaces/bridge/node.tag/node.def +++ b/templates/interfaces/bridge/node.tag/node.def @@ -1 +1 @@ -help: "Set bridge parameters" +help: Set bridge parameters diff --git a/templates/interfaces/bridge/node.tag/priority/node.def b/templates/interfaces/bridge/node.tag/priority/node.def index 650958ef..f2876989 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: Set the priority for this bridge default: 0 -update: "sudo brctl setbridgeprio $(../@) $(@)" -delete: "sudo brctl setbridgeprio $(../@) $(@)" +update:expression: "sudo brctl setbridgeprio $VAR(../@) $VAR(@)" +delete:expression: "sudo brctl setbridgeprio $VAR(../@) $VAR(@)" diff --git a/templates/interfaces/bridge/node.tag/stp/node.def b/templates/interfaces/bridge/node.tag/stp/node.def index eb87287b..88f6c32b 100644 --- a/templates/interfaces/bridge/node.tag/stp/node.def +++ b/templates/interfaces/bridge/node.tag/stp/node.def @@ -1,9 +1,9 @@ type: bool -help: "Enable spanning tree protocol" +help: Enable spanning tree protocol default: false -update: "if [ x$(@) == xtrue ]; then \ - sudo brctl stp $(../@) on; \ +update:expression: "if [ x$VAR(@) == xtrue ]; then \ + sudo brctl stp $VAR(../@) on; \ else \ - sudo brctl stp $(../@) off; \ + sudo brctl stp $VAR(../@) off; \ fi; " -delete: "sudo brctl stp $(../@) off" +delete:expression: "sudo brctl stp $VAR(../@) off" 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 f6ca51e4..9a071930 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def @@ -1,12 +1,12 @@ type: txt -help: "Add this interface to a bridge-group" -syntax: exec " \ - if [ -z \"`sudo brctl show | grep $(@) `\" ]; then \ - echo bridge interface $(@) doesn\\'t exist on this system ; \ +help: Add 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 ; \ exit 1 ; \ fi ; " -update: "sudo brctl addif $(@) $(../../@)" -delete: "sudo brctl delif $(@) $(../../@)" -#allowed: local -a array ; -# array=( /sys/class/net/br* ) ; -# echo -n ${array[@]##*/} +update:expression: "sudo brctl addif $VAR(@) $VAR(../../@)" +delete:expression: "sudo brctl delif $VAR(@) $VAR(../../@)" +allowed: local -a array ; + array=( /sys/class/net/br* ) ; + echo -n ${array[@]##*/} 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 1c2bbde1..f3ae520f 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" -commit: $(../bridge/) != ""; "Must configure bridge interface" -update: "sudo brctl setpathcost $(../../@) $(@)" +help: Set the path cost for this port +commit:expression: $VAR(../bridge/) != ""; "Must configure bridge interface" +update:expression: "sudo brctl setpathcost $VAR(../../@) $VAR(@)" diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/node.def index b76b5d71..fd392431 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/node.def @@ -1,2 +1,2 @@ -help: "Add this interface to a bridge group" -commit: $(./bridge/) != ""; "Must set the bridge interface" +help: Add this interface to a bridge group +commit:expression: $VAR(./bridge/) != ""; "Must set the bridge interface" 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 d254b082..12200b72 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 path priority for this port" -commit: $(../bridge/) != ""; "Must configure bridge interface" -update: "sudo brctl setportprio $(../../@) $(@)" +help: Set the path priority for this port +commit:expression: $VAR(../bridge/) != ""; "Must configure bridge interface" +update:expression: "sudo brctl setportprio $VAR(../../@) $VAR(@)" 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 d655f6bc..fffa0eeb 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,12 +1,12 @@ type: txt -help: "Add this interface to a bridge-group" -syntax: exec " \ - if [ -z \"`sudo brctl show | grep $(@) `\" ]; then \ - echo bridge interface $(@) doesn\\'t exist on this system ; \ +help: Add 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 ; \ exit 1 ; \ fi ; " -update: "sudo brctl addif $(@) $(../../../../@).$(../../@)" -delete: "sudo brctl delif $(@) $(../../../../@).$(../../@)" -#allowed: local -a array ; -# array=( /sys/class/net/br* ) ; -# echo -n ${array[@]##*/} +update:expression: "sudo brctl addif $VAR(@) $VAR(../../../../@).$VAR(../../@)" +delete:expression: "sudo brctl delif $VAR(@) $VAR(../../../../@).$VAR(../../@)" +allowed: local -a array ; + array=( /sys/class/net/br* ) ; + echo -n ${array[@]##*/} 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 1c2bbde1..f3ae520f 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" -commit: $(../bridge/) != ""; "Must configure bridge interface" -update: "sudo brctl setpathcost $(../../@) $(@)" +help: Set the path cost for this port +commit:expression: $VAR(../bridge/) != ""; "Must configure bridge interface" +update:expression: "sudo brctl setpathcost $VAR(../../@) $VAR(@)" 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 b76b5d71..fd392431 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,2 +1,2 @@ -help: "Add this interface to a bridge group" -commit: $(./bridge/) != ""; "Must set the bridge interface" +help: Add this interface to a bridge group +commit:expression: $VAR(./bridge/) != ""; "Must set the bridge interface" 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 d254b082..12200b72 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 path priority for this port" -commit: $(../bridge/) != ""; "Must configure bridge interface" -update: "sudo brctl setportprio $(../../@) $(@)" +help: Set the path priority for this port +commit:expression: $VAR(../bridge/) != ""; "Must configure bridge interface" +update:expression: "sudo brctl setportprio $VAR(../../@) $VAR(@)" 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 b21963c6..e4892540 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" -commit: $(../address/) != ""; "Must define a primary IP address on $(../../@) vif $(../@)" -end: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $(../../@).$(../@) " +help: Configure VRRP +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 e3e0b083..d59bf682 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 @@ -1,8 +1,8 @@ tag: type: u32 -syntax: $(@) >= 0 && $(@) <= 255; "VRRP group must be between 1-255" -commit: $(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $(@)" -help: "Configure VRRP group number" -delete: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $(../../../@).$(../../@) --group $(@) " -#comp_help: possible completions -# <1-255> VRRP group number +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 +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 12c9f0f4..f033aa5d 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" -syntax: $(@) >= 1 && $(@) <=255; "Advertise interval must be between 1-255" -#comp_help: possible completions -# <1-255> Set advertise interval (default 1) +help: Configure 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 e3120d51..8e924a0e 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" -commit: $(./type/@) != ""; "You must set a authentication type" -commit: $(./password/@) != ""; "You must set a authentication password" +help: Configure 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 87855962..412d8274 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,2 +1,2 @@ type: txt -help: "Password text" +help: Password text 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 9f624356..33fbdae9 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,6 +1,6 @@ type: txt -help: "Authentication type" -syntax: $(@) in "simple", "AH", "ah"; "authentication must be simple or AH" -#comp_help: possible completions: -# simple Set simple password mode -# AH Set IP Authentication Header mode +help: Authentication type +syntax:expression: $VAR(@) in "simple", "AH", "ah"; "authentication must be simple or AH" +comp_help: possible completions: + simple Set simple password mode + AH Set IP Authentication Header mode 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 d457185a..835ad401 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: 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 a4f3c074..95761590 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: VRRP configuration 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 a0b0efa2..c3dc66cd 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,7 +1,7 @@ type: txt -help: "Preempt mode" +help: Preempt mode default: "true" -syntax: $(@) in "true", "false"; "preempt must be true or false" -#comp_help: possible completions: -# true (default) -# false +syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false" +comp_help: possible completions: + true (default) + false 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 413bba15..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: $(@) >= 0 &&$(@) <= 255; "priority must be between 1-255" -help: "Priority" -#comp_help: possible completions: -# <1-255> Set Priority +syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255" +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/sync-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def index 5fa24b92..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: "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 bcf9392f..516d6add 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,3 +1,3 @@ multi: type: ipv4 -help: "Configure virtual address" +help: Configure virtual address diff --git a/templates/interfaces/ethernet/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vrrp/node.def index 2c8cc58a..05cfb986 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" -commit: $(../address/) != ""; "Must define a primary IP address on $(../@)" -end: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $(../@) " +help: Configure 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 a61a022f..90bf0d5c 100644 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def +++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def @@ -1,8 +1,8 @@ tag: type: u32 -syntax: $(@) >= 0 && $(@) <= 255; "VRRP group must be between 1-255" -commit: $(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $(@)" -help: "Configure VRRP group number" -delete: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $(../../@) --group $(@) " -#comp_help: possible completions -# <1-255> VRRP group number +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 +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 12c9f0f4..f033aa5d 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" -syntax: $(@) >= 1 && $(@) <=255; "Advertise interval must be between 1-255" -#comp_help: possible completions -# <1-255> Set advertise interval (default 1) +help: Configure 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 e3120d51..8e924a0e 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" -commit: $(./type/@) != ""; "You must set a authentication type" -commit: $(./password/@) != ""; "You must set a authentication password" +help: Configure 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 87855962..412d8274 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,2 +1,2 @@ type: txt -help: "Password text" +help: Password text 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 9f624356..33fbdae9 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,6 +1,6 @@ type: txt -help: "Authentication type" -syntax: $(@) in "simple", "AH", "ah"; "authentication must be simple or AH" -#comp_help: possible completions: -# simple Set simple password mode -# AH Set IP Authentication Header mode +help: Authentication type +syntax:expression: $VAR(@) in "simple", "AH", "ah"; "authentication must be simple or AH" +comp_help: possible completions: + simple Set simple password mode + AH Set IP Authentication Header mode 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 d457185a..835ad401 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: 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 a4f3c074..95761590 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: VRRP configuration 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 a0b0efa2..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,7 +1,7 @@ type: txt -help: "Preempt mode" +help: Preempt mode default: "true" -syntax: $(@) in "true", "false"; "preempt must be true or false" -#comp_help: possible completions: -# true (default) -# false +syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false" +comp_help: possible completions: + true (default) + false 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 413bba15..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: $(@) >= 0 &&$(@) <= 255; "priority must be between 1-255" -help: "Priority" -#comp_help: possible completions: -# <1-255> Set Priority +syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255" +help: Priority +comp_help: possible completions: + <1-255> Set Priority 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 5fa24b92..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: "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 bcf9392f..516d6add 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,3 +1,3 @@ multi: type: ipv4 -help: "Configure virtual address" +help: Configure virtual address diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def index 8d8cc029..73c8e572 100644 --- a/templates/interfaces/tunnel/node.def +++ b/templates/interfaces/tunnel/node.def @@ -1,11 +1,11 @@ tag: type: txt -help: "Configure a tunnel interface" -syntax: $(@) in "tun0", "tun1", "tun2", "tun3", "tun4", "tun5", "tun6", "tun7", "tun8", "tun9" ; "Must be (tun0 - tun9)" -commit: $(./local-ip/) != "" ; "Must configure the tunnel local-ip" -commit: $(./remote-ip/) != "" ; "Must configure the tunnel remote-ip" -commit: $(./encapsulation/) != "" ; "Must configure the tunnel encapsulation" -create: "sudo ip tunnel add $(@) local $(./local-ip/@) remote $(./remote-ip/@) mode $(./encapsulation/@)" -create: "sudo ip link set $(@) up" -delete: "sudo ip tunnel del $(@)" -#comp_help: "Enter tunnel interface name (tun0 - tun9)" +help: Configure a tunnel interface +syntax:expression: $VAR(@) in "tun0", "tun1", "tun2", "tun3", "tun4", "tun5", "tun6", "tun7", "tun8", "tun9" ; "Must be (tun0 - tun9)" +commit:expression: $VAR(./local-ip/) != "" ; "Must configure the tunnel local-ip" +commit:expression: $VAR(./remote-ip/) != "" ; "Must configure the tunnel remote-ip" +commit:expression: $VAR(./encapsulation/) != "" ; "Must configure the tunnel encapsulation" +create:expression: "sudo ip tunnel add $VAR(@) local $VAR(./local-ip/@) remote $VAR(./remote-ip/@) mode $VAR(./encapsulation/@)" +create:expression: "sudo ip link set $VAR(@) up" +delete:expression: "sudo ip tunnel del $VAR(@)" +comp_help: "Enter tunnel interface name (tun0 - tun9)" diff --git a/templates/interfaces/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def index 06605f45..fe58ae05 100644 --- a/templates/interfaces/tunnel/node.tag/address/node.def +++ b/templates/interfaces/tunnel/node.tag/address/node.def @@ -1,8 +1,8 @@ multi: type: txt -help: "Configure an IP address for this interface" -syntax: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $(@) --dev $(../@)"; "Invalid IP address/prefix [$(@)] for interface $(../@)" -update: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $(@) --dev $(../@)"; "Error setting address $(@) on interface $(../@)" -delete: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $(@) --dev $(../@)"; "Error deleting address $(@) on interface $(../@)" -#comp_help:Possible completions: -# <IP address>/<prefix length>\tSet the IP address and prefix length +help: Configure 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(../@)" +comp_help:Possible completions: + <IP address>/<prefix length>\tSet 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 e443734d..e00ed857 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: Description of this tunnel interface diff --git a/templates/interfaces/tunnel/node.tag/disable/node.def b/templates/interfaces/tunnel/node.tag/disable/node.def index 56199085..9c795c61 100644 --- a/templates/interfaces/tunnel/node.tag/disable/node.def +++ b/templates/interfaces/tunnel/node.tag/disable/node.def @@ -1,3 +1,3 @@ -help: "Disable interface" -update: "sudo ip link set $(../@) down"; "Error disabling dev $(../@)" -delete: "sudo ip link set $(../@) up"; "Error enabling dev $(../@)" +help: Disable interface +update:expression: "sudo ip link set $VAR(../@) down"; "Error disabling dev $VAR(../@)" +delete:expression: "sudo ip link set $VAR(../@) up"; "Error enabling dev $VAR(../@)" diff --git a/templates/interfaces/tunnel/node.tag/encapsulation/node.def b/templates/interfaces/tunnel/node.tag/encapsulation/node.def index 9b495228..98745b2d 100644 --- a/templates/interfaces/tunnel/node.tag/encapsulation/node.def +++ b/templates/interfaces/tunnel/node.tag/encapsulation/node.def @@ -1,8 +1,8 @@ type: txt -help: "Set the encapsulation of this tunnel interface" -syntax: $(@) in "ipip", "gre", "sit"; "Must be (ipip, gre, sit)" -update: "sudo ip tunnel change $(../@) mode $(@)" -#comp_help: "possible completions: -# gre Set Generic Routing Encapsulation -# ipip Set IP in IP encapsulation -# sit Set Simple Internet Transition encapsulation +help: Set the encapsulation of this tunnel interface +syntax:expression: $VAR(@) in "ipip", "gre", "sit"; "Must be (ipip, gre, sit)" +update:expression: "sudo ip tunnel change $VAR(../@) mode $VAR(@)" +comp_help: "possible completions: + gre Set Generic Routing Encapsulation + ipip Set IP in IP encapsulation + sit Set Simple Internet Transition encapsulation diff --git a/templates/interfaces/tunnel/node.tag/key/node.def b/templates/interfaces/tunnel/node.tag/key/node.def index 691b1cbd..1c524984 100644 --- a/templates/interfaces/tunnel/node.tag/key/node.def +++ b/templates/interfaces/tunnel/node.tag/key/node.def @@ -1,6 +1,6 @@ type: u32 -help: "Set the tunnel key" -syntax: $(@) >= 0 && $(@) <= 999999; "Must be between 0-999999" -update: "sudo ip tunnel change $(../@) key $(@)" -#comp_help: possible completions -# <0-999999> Set a tunnel key +help: Set the tunnel key +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 999999; "Must be between 0-999999" +update:expression: "sudo ip tunnel change $VAR(../@) key $VAR(@)" +comp_help: possible completions + <0-999999> Set a tunnel key diff --git a/templates/interfaces/tunnel/node.tag/local-ip/node.def b/templates/interfaces/tunnel/node.tag/local-ip/node.def index 3276c636..6cdaf2a5 100644 --- a/templates/interfaces/tunnel/node.tag/local-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/local-ip/node.def @@ -1,6 +1,6 @@ type: ipv4 -help: "Enter the local IP address for this tunnel" -syntax: exec "if [ -z \"`ip addr list | grep $(@) `\" ]; then \ - echo IP address $(@) doesn\\'t exist on this system ; \ +help: Enter 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 ; \ fi ; " diff --git a/templates/interfaces/tunnel/node.tag/mtu/node.def b/templates/interfaces/tunnel/node.tag/mtu/node.def index ffdcc735..47dc34cf 100644 --- a/templates/interfaces/tunnel/node.tag/mtu/node.def +++ b/templates/interfaces/tunnel/node.tag/mtu/node.def @@ -1,7 +1,7 @@ type: u32 -help: "Set the tunnel MTU" -syntax: $(@) >= 64 && $(@) <= 8024; "Must be between 64-8024" -update: "sudo ip link set $(../@) mtu $(@)" -delete: "sudo ip link set $(../@) mtu 1476" -#comp_help: possible completions: -# <64-8024> Set MTU +help: Set the tunnel 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" +comp_help: possible completions: + <64-8024> Set MTU diff --git a/templates/interfaces/tunnel/node.tag/remote-ip/node.def b/templates/interfaces/tunnel/node.tag/remote-ip/node.def index b8713e46..e5ee1ffd 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: Enter 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 56a6c9e2..8cc69360 100644 --- a/templates/interfaces/tunnel/node.tag/tos/node.def +++ b/templates/interfaces/tunnel/node.tag/tos/node.def @@ -1,7 +1,7 @@ type: u32 -help: "Set the tunnel type of service" -syntax: $(@) >= 0 && $(@) <= 99; "Must be between 0-99" -update: "sudo ip tunnel change $(../@) tos $(@)" -delete: "sudo ip tunnel change $(../@) tos inherit" -#comp_help: possible completions -# <0-99> Set type of service +help: Set the tunnel type of service +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" +comp_help: possible completions + <0-99> Set type of service diff --git a/templates/interfaces/tunnel/node.tag/ttl/node.def b/templates/interfaces/tunnel/node.tag/ttl/node.def index 7bdfdeaa..1d194508 100644 --- a/templates/interfaces/tunnel/node.tag/ttl/node.def +++ b/templates/interfaces/tunnel/node.tag/ttl/node.def @@ -1,8 +1,8 @@ type: u32 -help: "Set the tunnel time to live" +help: Set the tunnel time to live default: 255 -syntax: $(@) >= 0 && $(@) <= 255; "Must be between 0-255" -update: "sudo ip tunnel change $(../@) ttl $(@)" -delete: "sudo ip tunnel change $(../@) ttl inherit" -#comp_help: possible completions: -# <0-255> Set time to live (default 255) +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" +update:expression: "sudo ip tunnel change $VAR(../@) ttl $VAR(@)" +delete:expression: "sudo ip tunnel change $VAR(../@) ttl inherit" +comp_help: possible completions: + <0-255> Set time to live (default 255) |