diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2011-05-03 17:28:08 +0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2011-05-03 17:28:08 +0800 |
| commit | 22d37f427054b52bd724c17d9656bca6dee7d3c5 (patch) | |
| tree | 656383e504a44572561e93a93898f31409886423 /templates/firewall/group/network-group | |
| parent | 6ce1a694e899ee9b99fd3ab55a6a156b6d76b91b (diff) | |
| download | vyatta-cfg-firewall-napa-dev.tar.gz vyatta-cfg-firewall-napa-dev.zip | |
modify firewall groups to work with new commitnapa-dev
Diffstat (limited to 'templates/firewall/group/network-group')
| -rw-r--r-- | templates/firewall/group/network-group/node.def | 10 | ||||
| -rw-r--r-- | templates/firewall/group/network-group/node.tag/network/node.def | 18 |
2 files changed, 2 insertions, 26 deletions
diff --git a/templates/firewall/group/network-group/node.def b/templates/firewall/group/network-group/node.def index e20b536..8e50b7d 100644 --- a/templates/firewall/group/network-group/node.def +++ b/templates/firewall/group/network-group/node.def @@ -15,12 +15,6 @@ syntax:expression: pattern $VAR(@) "^[^!]" ; \ syntax:expression: pattern $VAR(@) "^[^|;&$<>]*$" ; \ "Firewall group name cannot contain shell punctuation" -create: sudo /opt/vyatta/sbin/vyatta-ipset.pl \ - --action=create-set \ - --set-type=network \ - --set-name="$VAR(@)" +end: sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=update-set \ + --set-name="$VAR(@)" --set-type=network - -delete: sudo /opt/vyatta/sbin/vyatta-ipset.pl \ - --action=delete-set \ - --set-name="$VAR(@)" 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 4db4d49..7388561 100644 --- a/templates/firewall/group/network-group/node.tag/network/node.def +++ b/templates/firewall/group/network-group/node.tag/network/node.def @@ -12,21 +12,3 @@ syntax:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ syntax:expression: exec " \ /opt/vyatta/sbin/check_prefix_boundary $VAR(@)" \ -create: sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=add-member \ - --set-name=$VAR(../@) \ - --member="$VAR(@)" - -delete: sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=is-group-deleted \ - --set-name=$VAR(../@) --set-type=network; - if [ $? == 0 ] ; then - sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=is-group-used \ - --set-name=$VAR(../@) --set-type=network - if [ $? == 0 ] ; then - echo "Error: group [$VAR(../@)] still in use." - exit 1; - fi - fi - - sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=delete-member \ - --set-name=$VAR(../@) \ - --member="$VAR(@)" |