diff --git a/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh b/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh index 05659a9ff..fd48375b0 100755 --- a/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh +++ b/dns/bind/src/opnsense/scripts/OPNsense/Bind/dnsbl.sh @@ -137,7 +137,14 @@ install() { rm -rf ${WORKDIR} } -for CAT in $(echo ${1} | tr ',' ' '); do +DNSBL=${1} + +if [ -z "${DNSBL}" ]; then + . /etc/rc.conf.d/named + DNSBL=${named_dnsbl} +fi + +for CAT in $(echo ${DNSBL} | tr ',' ' '); do case "${CAT}" in aa) adaway diff --git a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named index 6f4d6766e..70167bad7 100644 --- a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named +++ b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named @@ -1,5 +1,10 @@ {% if helpers.exists('OPNsense.bind.general.enabled') and OPNsense.bind.general.enabled == '1' %} named_var_script="/usr/local/opnsense/scripts/OPNsense/Bind/setup.sh" +{% if helpers.exists('OPNsense.bind.dnsbl.enabled') and OPNsense.bind.dnsbl.enabled == '1' %} +{% if helpers.exists('OPNsense.bind.dnsbl.type') and OPNsense.bind.dnsbl.type != '' %} +named_dnsbl="{{ OPNsense.bind.dnsbl.type }}" +{% endif %} +{% endif %} named_enable="YES" {% else %} named_enable="NO"