Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename set public_dns_servers to proxy_dns_servers #106

Merged
merged 1 commit into from
Apr 22, 2024
Merged

Rename set public_dns_servers to proxy_dns_servers #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/netconf/nftables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func getDNSProxyDNAT(c config, port, zone string) DNAT {
return DNAT{
Comment: "dnat to dns proxy",
InInterfaces: svis,
DAddr: "@public_dns_servers",
DAddr: "@proxy_dns_servers",
Port: port,
Zone: zone,
DestSpec: AddrSpec{
Expand Down
2 changes: 1 addition & 1 deletion pkg/netconf/testdata/nftrules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ table inet metal {
}
}
table inet nat {
set public_dns_servers {
set proxy_dns_servers {
type ipv4_addr
flags interval
auto-merge
Expand Down
2 changes: 1 addition & 1 deletion pkg/netconf/testdata/nftrules_accept_forwarding
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ table inet metal {
}
}
table inet nat {
set public_dns_servers {
set proxy_dns_servers {
type ipv4_addr
flags interval
auto-merge
Expand Down
10 changes: 5 additions & 5 deletions pkg/netconf/testdata/nftrules_dmz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ table inet metal {
}
}
table inet nat {
set public_dns_servers {
set proxy_dns_servers {
type ipv4_addr
flags interval
auto-merge
Expand All @@ -63,10 +63,10 @@ table inet nat {

chain prerouting {
type nat hook prerouting priority 0; policy accept;
ip daddr @public_dns_servers iifname "vlan3981" tcp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
ip daddr @public_dns_servers iifname "vlan3981" udp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
ip daddr @public_dns_servers iifname "vlan3983" tcp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
ip daddr @public_dns_servers iifname "vlan3983" udp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
ip daddr @proxy_dns_servers iifname "vlan3981" tcp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
ip daddr @proxy_dns_servers iifname "vlan3981" udp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
ip daddr @proxy_dns_servers iifname "vlan3983" tcp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
ip daddr @proxy_dns_servers iifname "vlan3983" udp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
}
chain prerouting_ct {
type filter hook prerouting priority raw; policy accept;
Expand Down
10 changes: 5 additions & 5 deletions pkg/netconf/testdata/nftrules_dmz_app
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ table inet metal {
}
}
table inet nat {
set public_dns_servers {
set proxy_dns_servers {
type ipv4_addr
flags interval
auto-merge
Expand All @@ -63,10 +63,10 @@ table inet nat {

chain prerouting {
type nat hook prerouting priority 0; policy accept;
ip daddr @public_dns_servers iifname "vlan3981" tcp dport domain dnat ip to 10.0.20.2 comment "dnat to dns proxy"
ip daddr @public_dns_servers iifname "vlan3981" udp dport domain dnat ip to 10.0.20.2 comment "dnat to dns proxy"
ip daddr @public_dns_servers iifname "vlan3983" tcp dport domain dnat ip to 10.0.20.2 comment "dnat to dns proxy"
ip daddr @public_dns_servers iifname "vlan3983" udp dport domain dnat ip to 10.0.20.2 comment "dnat to dns proxy"
ip daddr @proxy_dns_servers iifname "vlan3981" tcp dport domain dnat ip to 10.0.20.2 comment "dnat to dns proxy"
ip daddr @proxy_dns_servers iifname "vlan3981" udp dport domain dnat ip to 10.0.20.2 comment "dnat to dns proxy"
ip daddr @proxy_dns_servers iifname "vlan3983" tcp dport domain dnat ip to 10.0.20.2 comment "dnat to dns proxy"
ip daddr @proxy_dns_servers iifname "vlan3983" udp dport domain dnat ip to 10.0.20.2 comment "dnat to dns proxy"
}
chain prerouting_ct {
type filter hook prerouting priority raw; policy accept;
Expand Down
10 changes: 5 additions & 5 deletions pkg/netconf/testdata/nftrules_ipv6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ table inet metal {
}
}
table inet nat {
set public_dns_servers {
set proxy_dns_servers {
type ipv4_addr
flags interval
auto-merge
Expand All @@ -63,10 +63,10 @@ table inet nat {

chain prerouting {
type nat hook prerouting priority 0; policy accept;
ip6 daddr @public_dns_servers iifname "vlan3981" tcp dport domain dnat ip6 to 2a02:c00:20::1 comment "dnat to dns proxy"
ip6 daddr @public_dns_servers iifname "vlan3981" udp dport domain dnat ip6 to 2a02:c00:20::1 comment "dnat to dns proxy"
ip6 daddr @public_dns_servers iifname "vlan3982" tcp dport domain dnat ip6 to 2a02:c00:20::1 comment "dnat to dns proxy"
ip6 daddr @public_dns_servers iifname "vlan3982" udp dport domain dnat ip6 to 2a02:c00:20::1 comment "dnat to dns proxy"
ip6 daddr @proxy_dns_servers iifname "vlan3981" tcp dport domain dnat ip6 to 2a02:c00:20::1 comment "dnat to dns proxy"
ip6 daddr @proxy_dns_servers iifname "vlan3981" udp dport domain dnat ip6 to 2a02:c00:20::1 comment "dnat to dns proxy"
ip6 daddr @proxy_dns_servers iifname "vlan3982" tcp dport domain dnat ip6 to 2a02:c00:20::1 comment "dnat to dns proxy"
ip6 daddr @proxy_dns_servers iifname "vlan3982" udp dport domain dnat ip6 to 2a02:c00:20::1 comment "dnat to dns proxy"
}
chain prerouting_ct {
type filter hook prerouting priority raw; policy accept;
Expand Down
6 changes: 3 additions & 3 deletions pkg/netconf/testdata/nftrules_shared
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ table inet metal {
}
}
table inet nat {
set public_dns_servers {
set proxy_dns_servers {
type ipv4_addr
flags interval
auto-merge
Expand All @@ -61,8 +61,8 @@ table inet nat {

chain prerouting {
type nat hook prerouting priority 0; policy accept;
ip daddr @public_dns_servers iifname "vlan3982" tcp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
ip daddr @public_dns_servers iifname "vlan3982" udp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
ip daddr @proxy_dns_servers iifname "vlan3982" tcp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
ip daddr @proxy_dns_servers iifname "vlan3982" udp dport domain dnat ip to 185.1.2.3 comment "dnat to dns proxy"
}
chain prerouting_ct {
type filter hook prerouting priority raw; policy accept;
Expand Down
2 changes: 1 addition & 1 deletion pkg/netconf/testdata/nftrules_vpn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ table inet metal {
}
}
table inet nat {
set public_dns_servers {
set proxy_dns_servers {
type ipv4_addr
flags interval
auto-merge
Expand Down
2 changes: 1 addition & 1 deletion pkg/netconf/testdata/nftrules_with_rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ table inet metal {
}
}
table inet nat {
set public_dns_servers {
set proxy_dns_servers {
type ipv4_addr
flags interval
auto-merge
Expand Down
2 changes: 1 addition & 1 deletion pkg/netconf/tpl/nftrules.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ table inet metal {
}
}
table inet nat {
set public_dns_servers {
set proxy_dns_servers {
type ipv4_addr
flags interval
auto-merge
Expand Down
Loading