diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-26 20:53:22 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2010-07-27 15:58:36 -0700 |
| commit | a6aa2159244af565c93a0d771326141b2bb90be2 (patch) | |
| tree | 8eb95932c54148205cef94a242bc7a16309e91d2 /templates/firewall/group | |
| parent | 17e233fa5b7a6b2e2e14a3e14c824ca056c2e11f (diff) | |
| download | vyatta-cfg-firewall-a6aa2159244af565c93a0d771326141b2bb90be2.tar.gz vyatta-cfg-firewall-a6aa2159244af565c93a0d771326141b2bb90be2.zip | |
Convert firewall rules to val_help:
Convert some (but not all) of existing rules using comp_help:
to use val_help:
(cherry picked from commit 77e13fa992a50cc5721bbad64235bff8f8ecd50d)
Diffstat (limited to 'templates/firewall/group')
7 files changed, 7 insertions, 24 deletions
diff --git a/templates/firewall/group/address-group/node.def b/templates/firewall/group/address-group/node.def index a19d9ff..9c118ff 100644 --- a/templates/firewall/group/address-group/node.def +++ b/templates/firewall/group/address-group/node.def @@ -24,6 +24,3 @@ create: sudo /opt/vyatta/sbin/vyatta-ipset.pl \ delete: sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=delete-set \ --set-name="$VAR(@)" - -comp_help: possible completions: - <txt> Set the name of the firewall address-group diff --git a/templates/firewall/group/address-group/node.tag/address/node.def b/templates/firewall/group/address-group/node.tag/address/node.def index 2e8edcd..c62f4dd 100644 --- a/templates/firewall/group/address-group/node.tag/address/node.def +++ b/templates/firewall/group/address-group/node.tag/address/node.def @@ -1,6 +1,8 @@ multi: type: txt help: Address-group member +val_help: ipv4; IPv4 address to match +val_help: ipv4range; IPv4 range to match (e.g. 10.0.0.1-10.0.0.200) syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-member \ @@ -54,7 +56,3 @@ delete: sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=is-group-deleted \ sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=delete-member \ --set-name=$VAR(../@) \ --member="$VAR(@)" - -comp_help: possible completions: - <x.x.x.x> IPv4 address to match - <x.x.x.x>-<x.x.x.x> IPv4 range to match (e.g. 10.0.0.1-10.0.0.200) diff --git a/templates/firewall/group/network-group/node.def b/templates/firewall/group/network-group/node.def index e407b0a..c09176f 100644 --- a/templates/firewall/group/network-group/node.def +++ b/templates/firewall/group/network-group/node.def @@ -24,6 +24,3 @@ create: sudo /opt/vyatta/sbin/vyatta-ipset.pl \ delete: sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=delete-set \ --set-name="$VAR(@)" - -comp_help: possible completions: - <txt> Set the name of the firewall network-group diff --git a/templates/firewall/group/network-group/node.tag/network/node.def b/templates/firewall/group/network-group/node.tag/network/node.def index 8899450..4db4d49 100644 --- a/templates/firewall/group/network-group/node.tag/network/node.def +++ b/templates/firewall/group/network-group/node.tag/network/node.def @@ -1,6 +1,7 @@ multi: type: ipv4net help: Network-group member +val_help: ipv4net; IPv4 Subnet to match syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-member \ @@ -29,6 +30,3 @@ delete: sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=is-group-deleted \ sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=delete-member \ --set-name=$VAR(../@) \ --member="$VAR(@)" - -comp_help: possible completions: - <x.x.x.x/x> IPv4 Subnet to match diff --git a/templates/firewall/group/node.def b/templates/firewall/group/node.def index 81afdd6..78edbb2 100644 --- a/templates/firewall/group/node.def +++ b/templates/firewall/group/node.def @@ -1,4 +1 @@ help: Firewall group - -comp_help: possible completions: - <txt> Set the name of the firewall group diff --git a/templates/firewall/group/port-group/node.def b/templates/firewall/group/port-group/node.def index ee655ee..0500ac1 100644 --- a/templates/firewall/group/port-group/node.def +++ b/templates/firewall/group/port-group/node.def @@ -24,6 +24,3 @@ create: sudo /opt/vyatta/sbin/vyatta-ipset.pl \ delete: sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=delete-set \ --set-name="$VAR(@)" - -comp_help: possible completions: - <txt> Set the name of the firewall port-group diff --git a/templates/firewall/group/port-group/node.tag/port/node.def b/templates/firewall/group/port-group/node.tag/port/node.def index ae7d944..c6f3173 100644 --- a/templates/firewall/group/port-group/node.tag/port/node.def +++ b/templates/firewall/group/port-group/node.tag/port/node.def @@ -2,6 +2,10 @@ multi: type: txt help: Port-group member +val_help: <name>; Named port (any name in /etc/services, e.g., http) +val_help: u32:1-65535; Numbered port +val_help: <start>-<end>; Numbered port range (e.g. 1001-1050) + syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-member \ --set-name=$VAR(../@) \ @@ -54,8 +58,3 @@ delete: sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=is-group-deleted \ sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=delete-member \ --set-name=$VAR(../@) \ --member="$VAR(@)" - -comp_help: possible completions: - <port name> Named port (any name in /etc/services, e.g., http) - <1-65535> Numbered port - <start>-<end> Numbered port range (e.g. 1001-1050) |