diff --git a/dns/bind/src/etc/namedb/named-options.conf.d/00-README.txt b/dns/bind/src/etc/namedb/named-options.conf.d/00-README.txt new file mode 100644 index 0000000000..4a35215199 --- /dev/null +++ b/dns/bind/src/etc/namedb/named-options.conf.d/00-README.txt @@ -0,0 +1,7 @@ +# Custom BIND Configuration Directory for BIND options +# +# Place your custom BIND options in .conf files in this directory +# Files are included in alphabetical order +# +# Example: +# forwarders port 853 tls Cloudflare-DoT { 1.1.1.2; 1.0.0.2; }; diff --git a/dns/bind/src/etc/namedb/named.conf.d/00-README.conf b/dns/bind/src/etc/namedb/named.conf.d/00-README.txt similarity index 100% rename from dns/bind/src/etc/namedb/named.conf.d/00-README.conf rename to dns/bind/src/etc/namedb/named.conf.d/00-README.txt diff --git a/dns/bind/src/opnsense/mvc/app/library/OPNsense/System/Status/BindOverrideStatus.php b/dns/bind/src/opnsense/mvc/app/library/OPNsense/System/Status/BindOverrideStatus.php index eb15970e6a..a5eb3cde61 100644 --- a/dns/bind/src/opnsense/mvc/app/library/OPNsense/System/Status/BindOverrideStatus.php +++ b/dns/bind/src/opnsense/mvc/app/library/OPNsense/System/Status/BindOverrideStatus.php @@ -47,7 +47,8 @@ public function __construct() public function collectStatus() { - if (count(glob('/usr/local/etc/namedb/named.conf.d/*')) > 1) { + if (count(glob('/usr/local/etc/namedb/named.conf.d/*.conf')) > 0 + or count(glob('/usr/local/etc/namedb/named-options.conf.d/*.conf')) > 0) { $this->internalMessage = gettext( 'The configuration contains manual overwrites, these may interfere with the settings configured here.' ); diff --git a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf index 9196b5de3e..2b010dc8fd 100644 --- a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf +++ b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf @@ -9,6 +9,7 @@ acl "{{ acl_list.name }}" { {{ acl_list.networks.replace(',', '; ') }}; }; {% endif %} options { + include "/usr/local/etc/namedb/named-options.conf.d/*.conf"; directory "/usr/local/etc/namedb/working"; pid-file "/var/run/named/pid";