From f38da6ba4d8218f945c3e6ca6c08dcd5460024be Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Tue, 30 Aug 2022 17:58:48 +0200
Subject: firewall: T4605: Rename filter tables to vyos_filter

---
 data/templates/firewall/nftables-geoip-update.j2 | 8 ++++----
 data/templates/firewall/nftables.j2              | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'data')

diff --git a/data/templates/firewall/nftables-geoip-update.j2 b/data/templates/firewall/nftables-geoip-update.j2
index f9e61a274..832ccc3e9 100644
--- a/data/templates/firewall/nftables-geoip-update.j2
+++ b/data/templates/firewall/nftables-geoip-update.j2
@@ -2,10 +2,10 @@
 
 {% if ipv4_sets is vyos_defined %}
 {%     for setname, ip_list in ipv4_sets.items() %}
-flush set ip filter {{ setname }}
+flush set ip vyos_filter {{ setname }}
 {%     endfor %}
 
-table ip filter {
+table ip vyos_filter {
 {%     for setname, ip_list in ipv4_sets.items() %}
     set {{ setname }} {
         type ipv4_addr
@@ -18,10 +18,10 @@ table ip filter {
 
 {% if ipv6_sets is vyos_defined %}
 {%     for setname, ip_list in ipv6_sets.items() %}
-flush set ip6 filter {{ setname }}
+flush set ip6 vyos_filter {{ setname }}
 {%     endfor %}
 
-table ip6 filter {
+table ip6 vyos_filter {
 {%     for setname, ip_list in ipv6_sets.items() %}
     set {{ setname }} {
         type ipv6_addr
diff --git a/data/templates/firewall/nftables.j2 b/data/templates/firewall/nftables.j2
index be9ff3a82..dde88d09d 100644
--- a/data/templates/firewall/nftables.j2
+++ b/data/templates/firewall/nftables.j2
@@ -5,7 +5,7 @@
 {% if first_install is not vyos_defined %}
 delete table ip vyos_filter
 {% endif %}
-table ip filter {
+table ip vyos_filter {
     chain VYOS_FW_FORWARD {
         type filter hook forward priority 0; policy accept;
 {% if state_policy is vyos_defined %}
@@ -115,7 +115,7 @@ table ip filter {
 {% if first_install is not vyos_defined %}
 delete table ip6 vyos_filter
 {% endif %}
-table ip6 filter {
+table ip6 vyos_filter {
     chain VYOS_FW6_FORWARD {
         type filter hook forward priority 0; policy accept;
 {% if state_policy is vyos_defined %}
-- 
cgit v1.2.3