dns/bind: add allow-notify, remove old list, fix lame-server flood (#1596)

This commit is contained in:
Michael
2019-11-29 17:19:58 +01:00
committed by Franco Fichtner
parent 64c84085d2
commit 48c9c27faa
7 changed files with 22 additions and 13 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
PLUGIN_NAME= bind
PLUGIN_VERSION= 1.10
PLUGIN_VERSION= 1.11
PLUGIN_COMMENT= BIND domain name service
PLUGIN_DEPENDS= bind914
PLUGIN_MAINTAINER= m.muenz@gmail.com
+6
View File
@@ -8,6 +8,12 @@ necessary for asking and answering name service questions.
Plugin Changelog
================
1.11
* Remove lame-server log flooding
* Remove HBBTV DNSBL
* Rewrite Log File section to new MVC code
1.10
* Add new ressource record types
@@ -28,6 +28,14 @@
<type>text</type>
<help>Set the IP address of master server when using slave mode.</help>
</field>
<field>
<id>domain.allownotifyslave</id>
<label>Allow Notfiy</label>
<style>tokenize</style>
<type>select_multiple</type>
<allownew>true</allownew>
<help>A list of allowed IP addresses to receive notifies from.</help>
</field>
<field>
<label>Master Zone</label>
<type>header</type>
@@ -24,7 +24,6 @@
<hpf>hpHosts FSA</hpf>
<hpp>hpHosts PSH</hpp>
<hup>hpHosts PUP</hup>
<ht>Hbbtv List</ht>
<mw>Malwaredomain List</mw>
<nc>NoCoin List</nc>
<pt>PornTop1M List</pt>
@@ -20,6 +20,11 @@
<masterip type="HostnameField">
<Required>N</Required>
</masterip>
<allownotifyslave type="NetworkField">
<Required>N</Required>
<FieldSeparator>,</FieldSeparator>
<asList>Y</asList>
</allownotifyslave>
<domainname type="TextField">
<default></default>
<Required>Y</Required>
@@ -196,13 +196,6 @@ hphosts-pup() {
rm ${WORKDIR}/hphosts-pup-raw
}
hbbtv() {
# HBBTV List
${FETCH} https://raw.githubusercontent.com/Akamaru/Pi-Hole-Lists/master/hbbtv.txt -o ${WORKDIR}/hbbtv-raw
sed "/\.$/d" ${WORKDIR}/hbbtv-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" > ${WORKDIR}/hbbtv
rm ${WORKDIR}/hbbtv-raw
}
simplead() {
# Simple Ad List
${FETCH} https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt -o ${WORKDIR}/simplead-raw
@@ -276,9 +269,6 @@ for CAT in $(echo ${DNSBL} | tr ',' ' '); do
hup)
hphosts-pup
;;
ht)
hbbtv
;;
nc)
nocoin
;;
@@ -109,7 +109,7 @@ zone "rpzbing" { type master; file "/usr/local/etc/namedb/master/bing.db"; notif
{% if domain.enabled == '1' %}
{% set allow_transfer = helpers.getUUID(domain.allowtransfer) %}
{% set allow_query = helpers.getUUID(domain.allowquery) %}
zone "{{ domain.domainname }}" { type {{ domain.type }}; {% if domain.type == 'slave' %}masters { {{ domain.masterip }}; }; file "/usr/local/etc/namedb/slave/{{ domain.domainname }}.db"; {% else %}file "/usr/local/etc/namedb/master/{{ domain.domainname }}.db"; {% endif %}{% if domain.allowtransfer is defined %} allow-transfer { {{ allow_transfer.name }}; };{% endif %}{% if domain.allowquery is defined %} allow-query { {{ allow_query.name }}; };{% endif %} };
zone "{{ domain.domainname }}" { type {{ domain.type }}; {% if domain.type == 'slave' %}masters { {{ domain.masterip }}; }; {% if domain.allownotifyslave != '' %} allow-notify { {{ domain.allownotifyslave.replace(',', '; ') }}; };{% endif %} file "/usr/local/etc/namedb/slave/{{ domain.domainname }}.db"; {% else %}file "/usr/local/etc/namedb/master/{{ domain.domainname }}.db"; {% endif %}{% if domain.allowtransfer is defined %} allow-transfer { {{ allow_transfer.name }}; };{% endif %}{% if domain.allowquery is defined %} allow-query { {{ allow_query.name }}; };{% endif %} };
{% endif %}
{% endfor %}
{% endif %}
@@ -137,5 +137,6 @@ logging {
category general { default_log; };
category queries { query_log; };
category rpz { rpz_log; };
category lame-servers { null; };
};
{% endif %}