From a11f92745d8e0164106c80c6476723bd51e016c5 Mon Sep 17 00:00:00 2001 From: nhyatt Date: Tue, 7 Nov 2023 12:22:25 -0600 Subject: [PATCH] adds doh server lists --- cmd/bind/init.go | 2 +- config/config.yaml | 1 + go.mod | 4 ++-- go.sum | 8 ++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cmd/bind/init.go b/cmd/bind/init.go index 03bad98..fb49997 100644 --- a/cmd/bind/init.go +++ b/cmd/bind/init.go @@ -10,7 +10,7 @@ import ( "time" "github.com/hashicorp/logutils" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) // getEnvString returns string from environment variable diff --git a/config/config.yaml b/config/config.yaml index ba00df8..2252883 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -17,6 +17,7 @@ sources: - "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareHosts.txt" - "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts" domainListURLs: + - "https://raw.githubusercontent.com/dibdot/DoH-IP-blocklists/master/doh-domains.txt" - "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt" - "https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt" - "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt" diff --git a/go.mod b/go.mod index a1ec3a2..8c51e79 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module pihole-blocklist/v2 go 1.18 require ( - github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d + github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 github.com/hashicorp/logutils v1.0.0 - gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 94db497..d78e584 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ -github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= -github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=