summaryrefslogtreecommitdiff
path: root/templates/firewall
diff options
context:
space:
mode:
authorMarian Tudosoiu <marian.tudosoiu@1and1.ro>2018-04-19 10:57:25 +0300
committerMarian Tudosoiu <marian.tudosoiu@1and1.ro>2018-04-19 10:57:25 +0300
commit7272364a23c9f00f17f719c1efee756d960e8984 (patch)
tree603fb3908c07f90c77e3cbfe28ed6f407bd98c71 /templates/firewall
parentf6e4c60702f810cc06449782f64c7e5a7e20abb2 (diff)
downloadvyatta-cfg-firewall-7272364a23c9f00f17f719c1efee756d960e8984.tar.gz
vyatta-cfg-firewall-7272364a23c9f00f17f719c1efee756d960e8984.zip
Task T35 - enable prune-deleted-sets for inet6 family firewall templates
Diffstat (limited to 'templates/firewall')
-rw-r--r--templates/firewall/ipv6-name/node.def10
1 files changed, 7 insertions, 3 deletions
diff --git a/templates/firewall/ipv6-name/node.def b/templates/firewall/ipv6-name/node.def
index e7e1167..2e20b9a 100644
--- a/templates/firewall/ipv6-name/node.def
+++ b/templates/firewall/ipv6-name/node.def
@@ -14,17 +14,21 @@ syntax:expression: ! pattern $VAR(@) "^VZONE" ; \
end: if sudo /opt/vyatta/sbin/vyatta-firewall.pl --update-rules "firewall ipv6-name" "$VAR(@)" ;
then
- if [ ${COMMIT_ACTION} = 'DELETE' ] ;
+ if [ ${COMMIT_ACTION} = 'DELETE' ] ;
then
if sudo /opt/vyatta/sbin/vyatta-firewall.pl --teardown-ok "firewall ipv6-name" ;
then
- sudo /opt/vyatta/sbin/vyatta-firewall.pl --teardown "firewall ipv6-name"
+ if sudo /opt/vyatta/sbin/vyatta-firewall.pl --teardown "firewall ipv6-name"; then
+ ${vyatta_sbindir}/vyatta-firewall-trap.pl --level="firewall ipv6-name $VAR(@)"
+ fi
fi
+ else
+ ${vyatta_sbindir}/vyatta-firewall-trap.pl --level="firewall ipv6-name $VAR(@)"
fi
else
exit 1;
fi
- ${vyatta_sbindir}/vyatta-firewall-trap.pl --level="firewall ipv6-name $VAR(@)"
+ sudo /opt/vyatta/sbin/vyatta-ipset.pl --action=prune-deleted-sets
create: sudo /opt/vyatta/sbin/vyatta-firewall.pl --setup ip6tables "firewall ipv6-name"