diff options
| author | Indrajit Raychaudhuri <irc@indrajit.com> | 2023-12-29 18:21:33 -0600 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-02-01 19:52:15 +0000 |
| commit | 3e713e5c96081206c47a44cf044428bcfa27cd02 (patch) | |
| tree | 1d62c4d767de73b791d57d873ec5da44be71b74d /data/templates/dns-forwarding/recursor.conf.j2 | |
| parent | 8996552e61af617c9193895ad5588191615be16d (diff) | |
| download | vyos-1x-3e713e5c96081206c47a44cf044428bcfa27cd02.tar.gz vyos-1x-3e713e5c96081206c47a44cf044428bcfa27cd02.zip | |
dns: T5959: Streamline dns forwarding service
Streamline configuration and operation of dns forwarding service in
following ways:
- Remove `dns_forwarding_reset.py` as its functionality is now covered
by `dns.py`
- Adjust function names in `dns.py` to disambiguate between DNS
forwarding and dynamic DNS
- Remove `dns_forwarding_restart.sh` as its functionality is inlined in
`dns-forwarding.xml`
- Templatize systemd override for `pdns-recursor.service` and move the
generated override files in /run. This ensures that the override files
are always generated afresh after boot
- Simplify the systemd override file by removing the redundant overrides
- Relocate configuration path for pdns-recursor to `/run/pdns-recursor`
and utilize the `RuntimeDirectory` default that pdns-recursor expects
- We do not need to use custom `--socket-dir` path anymore, the default
path (viz., `/run/pdns-recursor` is fine)
(cherry picked from commit 1c1fb5fb4bd7c0d205b28caf90357ad56423464f)
Diffstat (limited to 'data/templates/dns-forwarding/recursor.conf.j2')
| -rw-r--r-- | data/templates/dns-forwarding/recursor.conf.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/dns-forwarding/recursor.conf.j2 b/data/templates/dns-forwarding/recursor.conf.j2 index 55b37732b..e4e8e7044 100644 --- a/data/templates/dns-forwarding/recursor.conf.j2 +++ b/data/templates/dns-forwarding/recursor.conf.j2 @@ -12,7 +12,7 @@ allow-from={{ allow_from | join(',') }} log-common-errors=yes non-local-bind=yes query-local-address={{ source_address | join(',') }} -lua-config-file=recursor.conf.lua +lua-config-file={{ config_dir }}/recursor.conf.lua # cache-size max-cache-entries={{ cache_size }} @@ -56,4 +56,4 @@ serve-rfc1918={{ 'no' if no_serve_rfc1918 is vyos_defined else 'yes' }} # zones auth-zones={% for z in authoritative_zones %}{{ z.name }}={{ z.file }}{{- "," if not loop.last -}}{% endfor %} -forward-zones-file=recursor.forward-zones.conf +forward-zones-file={{ config_dir }}/recursor.forward-zones.conf |