diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 4c49bd7..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.env diff --git a/config.yml b/config.yml index c687639..a03b7e2 100644 --- a/config.yml +++ b/config.yml @@ -2,21 +2,27 @@ ports: dns: 53 bootstrapDns: - - https://193.110.81.0 - - https://185.253.5.0 + - https://1.1.1.1/dns-query +startVerifyUpstream: true connectIPVersion: v4 upstreams: groups: default: - - https://dns0.eu/ - init: - strategy: fast + - https://cloudflare-dns.com/dns-query blocking: - denylists: + blackLists: 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 @@ -26,7 +32,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 - allowlists: + whiteLists: main: - | t.co @@ -50,6 +56,6 @@ caching: customDNS: mapping: unifi.home: 10.20.30.1 - services.home: 10.10.10.5 - pi.home: 10.10.10.6 - nas.home: 10.10.10.7 + pi.home: 10.20.30.5 + services.home: 10.20.30.6 + nas.home: 10.20.30.7 diff --git a/compose.yml b/docker-compose.yaml similarity index 80% rename from compose.yml rename to docker-compose.yaml index 26167d8..e942588 100644 --- a/compose.yml +++ b/docker-compose.yaml @@ -1,3 +1,6 @@ +--- +version: "3.5" + networks: blocky: name: blocky @@ -10,8 +13,8 @@ services: networks: - blocky ports: - - "${LOCAL_IP}:53:53/tcp" - - "${LOCAL_IP}:53:53/udp" + - "53:53/tcp" + - "53:53/udp" environment: - TZ=Europe/Warsaw volumes: