Bookworm compatibility

Disables security update notifications. In Bookworm PowerDNS fails to start
with security update notifications enabled.

Adds special handling of config value "omit" for setting new config options
in a backwards-compatible way.
This commit is contained in:
Julian Rother 2023-10-17 23:30:23 +02:00
parent e7aab5c037
commit a270aad58e
No known key found for this signature in database
GPG key ID: 8F9B6AE9BAAE4899
2 changed files with 4 additions and 3 deletions

View file

@ -12,13 +12,14 @@ powerdns:
"include-dir": "/etc/powerdns/pdns.d" "include-dir": "/etc/powerdns/pdns.d"
"launch": "launch":
bind: {} bind: {}
"master": "no" "master": "no" # deprecated in 4.5.x, renamed to "primary" in newer versions
"resolver": 127.0.0.1 "resolver": 127.0.0.1
"reuseport": "yes" "reuseport": "yes"
"setgid": pdns "setgid": pdns
"setuid": pdns "setuid": pdns
"slave": "no" "slave": "no" # deprecated in 4.5.x, renamed to "secondary" in newer versions
"version-string": "1" "version-string": "1"
"security-poll-suffix": ""
zonemeta: {} zonemeta: {}
zonemeta_defaults: zonemeta_defaults:
type: native type: native

View file

@ -1,6 +1,6 @@
{% set array_values = ['allow-axfr-ips'] %} {% set array_values = ['allow-axfr-ips'] %}
{% set dict_array_values = ['launch'] %} {% set dict_array_values = ['launch'] %}
{% for option in powerdns.config.keys()|sort %} {% for option in powerdns.config.keys()|sort if powerdns.config[option] != omit %}
{{ option }}={% if option in array_values %}{{ powerdns.config[option]|join(',' ) }}{% elif option in dict_array_values %}{{ powerdns.config[option].keys()|sort()|join(',' ) }}{% else %}{{ powerdns.config[option] }}{% endif %} {{ option }}={% if option in array_values %}{{ powerdns.config[option]|join(',' ) }}{% elif option in dict_array_values %}{{ powerdns.config[option].keys()|sort()|join(',' ) }}{% else %}{{ powerdns.config[option] }}{% endif %}
{% endfor %} {% endfor %}