diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c49bd7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.env diff --git a/docker-compose.yaml b/compose.yml similarity index 80% rename from docker-compose.yaml rename to compose.yml index e942588..26167d8 100644 --- a/docker-compose.yaml +++ b/compose.yml @@ -1,6 +1,3 @@ ---- -version: "3.5" - networks: blocky: name: blocky @@ -13,8 +10,8 @@ services: networks: - blocky ports: - - "53:53/tcp" - - "53:53/udp" + - "${LOCAL_IP}:53:53/tcp" + - "${LOCAL_IP}:53:53/udp" environment: - TZ=Europe/Warsaw volumes: diff --git a/config.yml b/config.yml index a03b7e2..c687639 100644 --- a/config.yml +++ b/config.yml @@ -2,27 +2,21 @@ ports: dns: 53 bootstrapDns: - - https://1.1.1.1/dns-query -startVerifyUpstream: true + - https://193.110.81.0 + - https://185.253.5.0 connectIPVersion: v4 upstreams: groups: default: - - https://cloudflare-dns.com/dns-query + - https://dns0.eu/ + init: + strategy: fast blocking: - blackLists: + denylists: main: - http://hole.cert.pl/domains/domains_hosts.txt - - https://blocklistproject.github.io/Lists/abuse.txt - - https://blocklistproject.github.io/Lists/ads.txt - - https://blocklistproject.github.io/Lists/fraud.txt - - https://blocklistproject.github.io/Lists/malware.txt - - https://blocklistproject.github.io/Lists/phishing.txt - - https://blocklistproject.github.io/Lists/ransomware.txt - - https://blocklistproject.github.io/Lists/scam.txt - - https://blocklistproject.github.io/Lists/tracking.txt - https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext - https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/Ad_filter_list_by_Disconnect.txt - https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/adguard_host.txt @@ -32,7 +26,7 @@ blocking: - https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/easylist_host.txt - https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/gambling-hosts.txt - https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts - whiteLists: + allowlists: main: - | t.co @@ -56,6 +50,6 @@ caching: customDNS: mapping: unifi.home: 10.20.30.1 - pi.home: 10.20.30.5 - services.home: 10.20.30.6 - nas.home: 10.20.30.7 + services.home: 10.10.10.5 + pi.home: 10.10.10.6 + nas.home: 10.10.10.7