Skip to content
Snippets Groups Projects
Commit 034699ad authored by ale's avatar ale
Browse files

Merge branch 'obsolete-bind-options' into 'master'

Drop Bind9 options that are obsolete in bullseye

Closes prod#250

See merge request !226
parents 01c5cf0c 8cb3e69c
No related branches found
No related tags found
1 merge request!226Drop Bind9 options that are obsolete in bullseye
...@@ -8,8 +8,10 @@ view "internal-in" in { ...@@ -8,8 +8,10 @@ view "internal-in" in {
{% endfor %} {% endfor %}
}; };
recursion yes; recursion yes;
{% if float_debian_dist == 'buster' %}
additional-from-auth yes; additional-from-auth yes;
additional-from-cache yes; additional-from-cache yes;
{% endif %}
zone-statistics no; zone-statistics no;
// Send minimal responses, to avoid problems with the Spamassassin // Send minimal responses, to avoid problems with the Spamassassin
...@@ -31,11 +33,13 @@ view "external-in" in { ...@@ -31,11 +33,13 @@ view "external-in" in {
recursion no; recursion no;
zone-statistics yes; zone-statistics yes;
{% if float_debian_dist == 'buster' %}
// Do not trust the cache when generating additional records // Do not trust the cache when generating additional records
// for our authoritative zones. // for our authoritative zones.
additional-from-auth no; additional-from-auth no;
additional-from-cache no; additional-from-cache no;
{% endif %}
// Include manually-maintained zones. // Include manually-maintained zones.
include "/etc/bind/named.conf.external-custom-zones"; include "/etc/bind/named.conf.external-custom-zones";
......
...@@ -28,7 +28,9 @@ options { ...@@ -28,7 +28,9 @@ options {
listen-on-v6 { any; }; listen-on-v6 { any; };
{% endif %} {% endif %}
{% if float_debian_dist == 'buster' %}
dnssec-enable yes; dnssec-enable yes;
{% endif %}
dnssec-validation auto; dnssec-validation auto;
notify no; notify no;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment