diff options
Diffstat (limited to 'templates')
14 files changed, 34 insertions, 49 deletions
diff --git a/templates/interfaces/bonding/node.tag/vif/node.def b/templates/interfaces/bonding/node.tag/vif/node.def index a9cc2bfa..b9b544a2 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.def @@ -3,6 +3,8 @@ priority: 320 type: u32 help: Virtual Local Area Network (VLAN) ID syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094" +val_help:<0-4094>:VLAN ID + create: read -a SLAVES </sys/class/net/$VAR(../@)/bonding/slaves if [ ${#SLAVES[*]} -eq 0 ]; then echo "Must configure slave devices for bond interface $VAR(../@) before adding vif" @@ -12,5 +14,3 @@ create: read -a SLAVES </sys/class/net/$VAR(../@)/bonding/slaves ip link set "$VAR(../@).$VAR(@)" up sudo sh -c "/opt/vyatta/sbin/vyatta-link-detect $VAR(../@).$VAR(@) on" delete: ip link delete dev "$VAR(../@).$VAR(@)" type vlan id $VAR(@) -comp_help: possible completions: - <0-4094> Set VLAN ID diff --git a/templates/interfaces/ethernet/node.tag/duplex/node.def b/templates/interfaces/ethernet/node.tag/duplex/node.def index c4419a2c..a032266d 100644 --- a/templates/interfaces/ethernet/node.tag/duplex/node.def +++ b/templates/interfaces/ethernet/node.tag/duplex/node.def @@ -2,12 +2,12 @@ type: txt help: Duplex mode default: "auto" syntax:expression: $VAR(@) in "auto", "half", "full"; "duplex must be auto, half or full" +val_help:auto:Auto negotiation (default) +val_help:half:Half duplex +val_help:full:Full duplex + commit:expression: ( $VAR(@) == "auto" && $VAR(../speed/@) == "auto" ) || \ ( $VAR(@) != "auto" && $VAR(../speed/@) != "auto" ) ; \ "if duplex is hardcoded, speed must also be hardcoded" update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \ --speed-duplex $VAR(../speed/@) $VAR(@) -comp_help:Possible completions: - auto\t\tAuto negotiation (default) - half\t\tHalf duplex - full\t\tFull duplex diff --git a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def index ae1e3da7..b1c33b6b 100644 --- a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def +++ b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def @@ -15,9 +15,8 @@ type: txt help: CPU interrupt affinity mask -comp_help: Possible completions: - XX\tHexidecimal bitmask representing CPUs that this NIC will interrupt - auto\tSet affinity automatically +val_help:<hex number>:Bitmask representing CPUs that this NIC will interrupt +val_help:auto:affinity automatically (default) default: "auto" diff --git a/templates/interfaces/ethernet/node.tag/speed/node.def b/templates/interfaces/ethernet/node.tag/speed/node.def index 932c88e5..5d68f524 100644 --- a/templates/interfaces/ethernet/node.tag/speed/node.def +++ b/templates/interfaces/ethernet/node.tag/speed/node.def @@ -2,15 +2,15 @@ type: txt help: Link speed default: "auto" syntax:expression: $VAR(@) in "auto", "10", "100", "1000", "2500", "10000"; "Speed must be auto, 10, 100, 1000, 2500, or 10000" +val_help:auto:Auto negotiation (default) +val_help:10:10 Mbit/sec +val_help:100:100 Mbit/sec +val_help:1000:1 Gbit/sec +val_help:2500:2.5 Gbit/sec +val_help:10000:10 Gbit/sec + commit:expression: ( $VAR(@) == "auto" && $VAR(../duplex/@) == "auto" ) || \ ( $VAR(@) != "auto" && $VAR(../duplex/@) != "auto" ) ; \ "if speed is hardcoded, duplex must also be hardcoded" update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \ --speed-duplex $VAR(@) $VAR(../duplex/@) -comp_help:Possible completions: - auto\t\tAuto negotiation (default) - 10 \t\t10 Mbit/sec - 100 \t\t100 Mbit/sec - 1000\t\t1 Gbit/sec - 2500\t\t2.5 Gbit/sec - 10000\t10 Gbit/sec diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def index 1ad32323..0076668e 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.def @@ -2,8 +2,8 @@ tag: priority: 319 type: u32 help: Virtual Local Area Network (VLAN) ID - syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094" +val_help:<0-4094>:VLAN ID create: if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) then echo "Error creating VLAN device $VAR(../@).$VAR(@)" @@ -17,5 +17,3 @@ create: if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0 ip link delete dev "$VAR(../@).$VAR(@)" type vlan id $VAR(@) -comp_help: possible completions: - <0-4094> Set VLAN ID diff --git a/templates/interfaces/loopback/node.tag/address/node.def b/templates/interfaces/loopback/node.tag/address/node.def index 3fb6d38c..814ddad6 100644 --- a/templates/interfaces/loopback/node.tag/address/node.def +++ b/templates/interfaces/loopback/node.tag/address/node.def @@ -1,7 +1,5 @@ multi: - -type: txt - +type: ipv4net,ipv6net help: IP address syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-set $VAR(@) --dev $VAR(../@)"; \ @@ -12,7 +10,3 @@ create: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: - <x.x.x.x/x> Set the IP address and prefix length - <h:h:h:h:h:h:h:h/x> Set the IPv6 address and prefix length diff --git a/templates/interfaces/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def index 747347b3..f9c5bd74 100644 --- a/templates/interfaces/tunnel/node.tag/address/node.def +++ b/templates/interfaces/tunnel/node.tag/address/node.def @@ -1,5 +1,5 @@ multi: -type: txt +type: ipv4net,ipv6net help: IP address syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)"; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)" @@ -8,6 +8,3 @@ create: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: - <x.x.x.x/x> Set the IP address and prefix length - <h:h:h:h:h:h:h:h/x> Set the IPv6 address and prefix length diff --git a/templates/interfaces/tunnel/node.tag/encapsulation/node.def b/templates/interfaces/tunnel/node.tag/encapsulation/node.def index 50480b93..79c57310 100644 --- a/templates/interfaces/tunnel/node.tag/encapsulation/node.def +++ b/templates/interfaces/tunnel/node.tag/encapsulation/node.def @@ -7,9 +7,8 @@ create:expression: "true" update:expression: "false" ; \ "Encapsulation can only be set at tunnel creation for $VAR(../@)" -comp_help: possible completions: - gre Set Generic Routing Encapsulation - gre-bridge Set Generic Routing Encapsulation bridge interface - ipip Set IP in IP encapsulation - sit Set Simple Internet Transition encapsulation +val_help:gre:Generic Routing Encapsulation +val_help:gre-bridge:Generic Routing Encapsulation bridge interface +val_help:ipip:IP in IP encapsulation +val_help:sit: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 2362423f..e873765f 100644 --- a/templates/interfaces/tunnel/node.tag/key/node.def +++ b/templates/interfaces/tunnel/node.tag/key/node.def @@ -15,5 +15,4 @@ create:expression: "true" update:expression: "false" ; \ "Key can only be set at tunnel creation for $VAR(../@)" -comp_help: possible completions - <0-999999> Set a tunnel key +val_help:<0-999999>:Tunnel key diff --git a/templates/interfaces/tunnel/node.tag/multicast/node.def b/templates/interfaces/tunnel/node.tag/multicast/node.def index dbe117de..8fd45da6 100644 --- a/templates/interfaces/tunnel/node.tag/multicast/node.def +++ b/templates/interfaces/tunnel/node.tag/multicast/node.def @@ -1,6 +1,8 @@ type: txt help: Multicast operation over tunnel default: "disable" +val_help:enable:Enable Multicast +val_help:disable:Disable Multicast (default) syntax:expression: $VAR(@) in "enable", "disable"; \ "Must be 'disable' or 'enable'" @@ -8,7 +10,3 @@ syntax:expression: $VAR(@) in "enable", "disable"; \ create:expression: "true" update:expression: "false" ; \ "Multicast should be set at tunnel creation for $VAR(../@)" - -comp_help: "possible completions: - enable Enable Multicast - disable Disable Multicast (default) diff --git a/templates/interfaces/tunnel/node.tag/tos/node.def b/templates/interfaces/tunnel/node.tag/tos/node.def index d276319b..8a78875c 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: Type of Service (TOS) syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 99; "Must be between 0-99" +val_help:<0-99>:Type Of Service (TOS) + update: ip tunnel change $VAR(../@) tos $VAR(@) delete: 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 6e5f5f4f..bad9e027 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 default: 255 help: Time to live field -comp_help: possible completions: - <0-255> Set time to live (default 255) +val_help:<0-255>:Time to live (default 255) + syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" update:if [ "$VAR(../encapsulation/@)" != "gre-bridge" ]; then sudo ip tunnel change $VAR(../@) ttl $VAR(@); fi; delete:if [ "$VAR(../encapsulation/@)" != "gre-bridge" ]; then sudo ip tunnel change $VAR(../@) ttl inherit; fi; diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.def index a9089d6f..d30d5afb 100644 --- a/templates/system/login/user/node.tag/authentication/public-keys/node.def +++ b/templates/system/login/user/node.tag/authentication/public-keys/node.def @@ -1,7 +1,7 @@ tag: type: txt help: Remote access public keys -comp_help: The key identifier is a usually user@host as generated by ssh-keygen +val_help:<txt>; key identifier used by ssh-keygen (usually of form user@host) commit:expression: $VAR(./type/) != "" ; \ "Must configure public key type for $VAR(@)" diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def index a5744bfe..494964eb 100644 --- a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def +++ b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def @@ -4,6 +4,7 @@ syntax:expression: pattern $VAR(@) "^[0-9A-Za-z+/=]*$" ; \ "Invalid public key character not base-64" comp_help: Base64 encoded public key value. - The key is usually serval hundred bytes long (because of the size of - the public key encoding). You don't want to type it in directly, - instead use the loadkey interface. + The key is usually several hundred bytes long (because of the size of + the public key encoding). Use the loadkey tool to input key from + a URL or file. + |