mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-25 16:18:16 +03:00
1e45178980
Merge in DNS/adguard-home from AG-25392-confmigrate-vol.2 to master
Squashed commit of the following:
commit 7bcdf443135523022a7e5ed6b2da05fcd784a896
Merge: 4c25331b5 f84ff2bd0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 20:33:08 2023 +0300
Merge branch 'master' into AG-25392-confmigrate-vol.2
commit 4c25331b507078670e7f3505384b53179a210292
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 20:14:23 2023 +0300
confmigrate: fix fmt
commit d7dbfc46a7f825d248cb028d50b60eede941bf67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 20:07:25 2023 +0300
confmigrate: imp code
commit cd29729a23d1782a0b5fbd1e9153fe61ff3dbc71
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 18:21:14 2023 +0300
confmigrate: imp code, split files
commit f075a14c251c68a13152709e14a326ad17c2f889
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 17:19:47 2023 +0300
confmigrate: imp code
commit 37335597e7870184528c1d868e2d5bd5525a74bb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 16:54:13 2023 +0300
confmigrate: imp code, docs
commit 1df0ddcad99e5056b4989d17490ca4b44ae17838
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 4 14:41:52 2023 +0300
all: add testdata
commit e62690dbe8e458811bbd6b115b4449affa729560
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 31 16:13:14 2023 +0300
all: imp code
commit 0934d5974b31a58b31b12412c3cd1a50810ffc4f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:50:52 2023 +0300
home: don't reread config
commit 7566ab6f330460bd608aae6dc0428a631e2fa4e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:43:57 2023 +0300
all: imp code
commit 6f6aae6290f8d3101f3678ecc705eee7030ad8d5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 15:25:46 2023 +0300
all: introduce confmigrate
32 lines
806 B
YAML
32 lines
806 B
YAML
bind_host: 127.0.0.1
|
|
bind_port: 3000
|
|
auth_name: testuser
|
|
auth_pass: testpassword
|
|
coredns:
|
|
port: 53
|
|
protection_enabled: true
|
|
filtering_enabled: true
|
|
safebrowsing_enabled: false
|
|
safesearch_enabled: false
|
|
parental_enabled: false
|
|
parental_sensitivity: 0
|
|
blocked_response_ttl: 10
|
|
querylog_enabled: true
|
|
upstream_dns:
|
|
- tls://1.1.1.1
|
|
- tls://1.0.0.1
|
|
filters:
|
|
- url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
|
|
name: ""
|
|
enabled: true
|
|
- url: https://adaway.org/hosts.txt
|
|
name: AdAway
|
|
enabled: false
|
|
- url: https://hosts-file.net/ad_servers.txt
|
|
name: hpHosts - Ad and Tracking servers only
|
|
enabled: false
|
|
- url: http://www.malwaredomainlist.com/hostslist/hosts.txt
|
|
name: MalwareDomainList.com Hosts List
|
|
enabled: false
|
|
schema_version: 1
|
|
user_rules: []
|