Skip to content

Commit

Permalink
Merge pull request #106 from metal-stack/proxy-dns-servers
Browse files Browse the repository at this point in the history 
Rename set public_dns_servers to proxy_dns_servers
  • Loading branch information
@vknabel
vknabel authored Apr 22, 2024
2 parents a8078ca + c77d17e commit f2edbfc
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion pkg/netconf/nftables.go
View file
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
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
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
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
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
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
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
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
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
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

0 comments on commit f2edbfc

Please sign in to comment.