feature/forwarders-port-tls-support #3

Merged
daniel merged 12 commits from feature/forwarders-port-tls-support into main 2026-01-28 22:29:11 +00:00
Showing only changes of commit e8f84fce0b - Show all commits

View File

@@ -458,6 +458,7 @@ options:
- <address> - <address>
- address: <address> - address: <address>
port: <port> port: <port>
tls: <tls_name>
# DNSSEC # DNSSEC
dnssec_enable: <bool> # DEPRECATED in 9.15+ dnssec_enable: <bool> # DEPRECATED in 9.15+
@@ -593,7 +594,8 @@ options:
forwarders: forwarders:
- 1.1.1.1 - 1.1.1.1
- 8.8.8.8 - address: 8.8.8.8
tls: dot-tls
dnssec_validation: auto dnssec_validation: auto
@@ -917,6 +919,7 @@ zones:
- <address> - <address>
- address: <address> - address: <address>
port: <port> port: <port>
tls: <tls_name>
# DNSSEC # DNSSEC
dnssec_policy: <policy_name> # DNSSEC policy to use dnssec_policy: <policy_name> # DNSSEC policy to use
@@ -1017,7 +1020,8 @@ zones:
forward: only forward: only
forwarders: forwarders:
- 10.0.0.1 - 10.0.0.1
- 10.0.0.2 - address: 10.0.0.2
tls: internal-tls
``` ```
--- ---
@@ -1079,9 +1083,9 @@ addresses:
- 10.0.0.0/8 - 10.0.0.0/8
``` ```
### Address with Port/DSCP ### Address with Port/TLS
For options accepting `address [port X] [dscp Y]`: For options accepting `address [port X] [tls Y]` (e.g., `forwarders`):
```yaml ```yaml
# Simple list # Simple list
@@ -1089,27 +1093,28 @@ forwarders:
- 1.1.1.1 - 1.1.1.1
- 8.8.8.8 - 8.8.8.8
# With source port/dscp # With global port/tls
forwarders: forwarders:
port: 5353 port: 853
dscp: 46 tls: dot-tls
addresses: addresses:
- 1.1.1.1 - 1.1.1.1
- 8.8.8.8 - 8.8.8.8
# Per-address port/dscp # Per-address port/tls
forwarders: forwarders:
- address: 1.1.1.1 - address: 1.1.1.1
port: 53 port: 53
- address: 8.8.8.8 - address: 8.8.8.8
port: 5353 port: 853
dscp: 46 tls: cloudflare-tls
# Mixed format # Mixed format
forwarders: forwarders:
- 1.1.1.1 - 1.1.1.1
- address: 8.8.8.8 - address: 8.8.8.8
port: 5353 port: 853
tls: dot-tls
``` ```
### Address with Key/TLS ### Address with Key/TLS