diff options
| author | Marian Tudosoiu <marian.tudosoiu@1and1.ro> | 2018-03-14 11:14:34 +0200 |
|---|---|---|
| committer | Marian Tudosoiu <marian.tudosoiu@1and1.ro> | 2018-03-14 11:14:34 +0200 |
| commit | 1d21300885e606ec9e8da2b9a9b7af898d896a24 (patch) | |
| tree | 6988078f89236c70a2102d17ff7f2eab8233b954 | |
| parent | 1fa169f72c2196a62d1f5fb3d0bce3bcf55a87be (diff) | |
| download | vyatta-cfg-firewall-1d21300885e606ec9e8da2b9a9b7af898d896a24.tar.gz vyatta-cfg-firewall-1d21300885e606ec9e8da2b9a9b7af898d896a24.zip | |
Task T35 place ipv6 groups under group config tree
| -rw-r--r-- | templates/firewall/group/ipv6-address-group/node.def | 2 | ||||
| -rw-r--r-- | templates/firewall/group/ipv6-network-group/node.def | 4 | ||||
| -rw-r--r-- | templates/firewall/group/network-group/node.def | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/templates/firewall/group/ipv6-address-group/node.def b/templates/firewall/group/ipv6-address-group/node.def index 7ce50d2..20e4430 100644 --- a/templates/firewall/group/ipv6-address-group/node.def +++ b/templates/firewall/group/ipv6-address-group/node.def @@ -1,7 +1,7 @@ tag: priority: 200 type: txt -help: Firewall address-group +help: Firewall ipv6-address-group syntax:expression: pattern $VAR(@) "^[[:graph:]]{1,31}$" ; \ "Firewall group name must be 31 characters or less" diff --git a/templates/firewall/group/ipv6-network-group/node.def b/templates/firewall/group/ipv6-network-group/node.def index 299b8cc..084fdb0 100644 --- a/templates/firewall/group/ipv6-network-group/node.def +++ b/templates/firewall/group/ipv6-network-group/node.def @@ -1,7 +1,7 @@ tag: priority: 200 type: txt -help: Firewall network-group +help: Firewall ipv6-network-group syntax:expression: pattern $VAR(@) "^[[:graph:]]{1,31}$" ; \ "Firewall group name must be 31 characters or less" @@ -17,7 +17,7 @@ syntax:expression: pattern $VAR(@) "^[^|;&$<>]*$" ; \ syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl --action=is-group-defined --set-name=$VAR(@) \ --set-type=network --set-family=inet6"; \ - "Firewall group name already used as Ipv6 group address" + "Firewall group name already used as Ipv4 group address" end: if sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=update-set \ --set-name="$VAR(@)" --set-type=network --set-family=inet6; then diff --git a/templates/firewall/group/network-group/node.def b/templates/firewall/group/network-group/node.def index ed9810d..14b8366 100644 --- a/templates/firewall/group/network-group/node.def +++ b/templates/firewall/group/network-group/node.def @@ -16,7 +16,7 @@ syntax:expression: pattern $VAR(@) "^[^|;&$<>]*$" ; \ "Firewall group name cannot contain shell punctuation" syntax:expression: exec "/opt/vyatta/sbin/vyatta-ipset.pl --action=is-group-defined --set-name=$VAR(@) \ - --set-type=address --set-family=inet"; \ + --set-type=network --set-family=inet"; \ "Firewall group name already used as Ipv6 group address" end: if sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=update-set \ |