From ed4913ff80ced5bb9bed866faaa389cf2fb66990 Mon Sep 17 00:00:00 2001 From: borgal Date: Thu, 7 Sep 2023 20:36:51 +0200 Subject: [PATCH] Config angepasst --- adguard/conf/AdGuardHome.yaml | 270 +++++++++++++++++++++++++--------- adguard/docker-compose.yml | 3 - 2 files changed, 204 insertions(+), 69 deletions(-) diff --git a/adguard/conf/AdGuardHome.yaml b/adguard/conf/AdGuardHome.yaml index 797205d..379fb8e 100644 --- a/adguard/conf/AdGuardHome.yaml +++ b/adguard/conf/AdGuardHome.yaml @@ -1,27 +1,22 @@ -bind_host: 0.0.0.0 -bind_port: 3000 +http: + pprof: + port: 6060 + enabled: false + address: 0.0.0.0:3000 + session_ttl: 720h users: - name: Borgal password: $2a$10$HyZNzwrzK7z1cveWb6tONebiUL26A45LfwZB5lezB34nUy4PAcIKm auth_attempts: 5 block_auth_min: 15 http_proxy: "" -language: "" +language: de theme: auto -debug_pprof: false -web_session_ttl: 720 dns: bind_hosts: - 0.0.0.0 port: 53 anonymize_client_ip: false - protection_enabled: true - blocking_mode: default - blocking_ipv4: "" - blocking_ipv6: "" - blocked_response_ttl: 10 - parental_block_host: family-block.dns.adguard.com - safebrowsing_block_host: standard-block.dns.adguard.com ratelimit: 0 ratelimit_whitelist: [] refuse_any: true @@ -34,13 +29,14 @@ dns: - 8.8.4.4 - '############# Lokal' - '[/fritz.box/]192.168.0.1' - - '[/192.in-addr.arpa/]192.168.0.1' + - '[/168.192.in-addr.arpa/]192.168.0.1' upstream_dns_file: "" bootstrap_dns: - 1.1.1.1 - 1.0.0.1 - 8.8.8.8 - 8.8.4.4 + fallback_dns: [] all_servers: false fastest_addr: false fastest_timeout: 1s @@ -68,17 +64,7 @@ dns: handle_ddr: true ipset: [] ipset_file: "" - filtering_enabled: true - filters_update_interval: 1 - parental_enabled: true - safesearch_enabled: false - safebrowsing_enabled: true - safebrowsing_cache_size: 1048576 - safesearch_cache_size: 1048576 - parental_cache_size: 1048576 - cache_time: 30 - rewrites: [] - blocked_services: [] + bootstrap_prefer_ipv6: false upstream_timeout: 10s private_networks: [] use_private_ptr_resolvers: true @@ -103,15 +89,15 @@ tls: private_key_path: "" strict_sni_check: false querylog: - enabled: true - file_enabled: true + ignored: [] interval: 24h size_memory: 1000 - ignored: [] -statistics: enabled: true - interval: 1 + file_enabled: true +statistics: ignored: [] + interval: 24h + enabled: true filters: - enabled: true url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt @@ -157,7 +143,7 @@ filters: url: https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt name: Spam404 id: 1656587031 - - enabled: true + - enabled: false url: https://raw.githubusercontent.com/notracking/hosts-blocklists/master/adblock/adblock.txt name: Notracking blocklist id: 1656587033 @@ -208,6 +194,19 @@ user_rules: - '@@||fhdi3gj7.r.us-east-1.awstrack.me^$important' - '@@||t.notifications.groupe-pvcp.com^$important' - '@@||metrics.brightcove.com^$important' + - '@@||notify-bugs-fra1.rtl.de^$important' + - '@@||ichnaea.netflix.com^$important' + - '@@||customerevents.netflix.com^$important' + - '@@||medumio96948.lt.acemlnb.com^$important' + - '@@||hamburg.de^$important' + - '@@||www.etracker.de^$important' + - '@@||hunkemoller.com^$important' + - '@@||as.bild.de^$important' + - '@@||click.cptrack.de^$important' + - '@@||lavieenrose.com^$important' + - '||eventtrack.pandasecurity.com^$important' + - '@@||telemetry-in.battle.net^$important' + - "" dhcp: enabled: false interface_name: eth0 @@ -225,6 +224,36 @@ dhcp: lease_duration: 86400 ra_slaac_only: false ra_allow_slaac: false +filtering: + blocking_ipv4: "" + blocking_ipv6: "" + blocked_services: + schedule: + time_zone: Europe/Berlin + ids: [] + protection_disabled_until: null + safe_search: + enabled: false + bing: true + duckduckgo: true + google: true + pixabay: true + yandex: true + youtube: true + blocking_mode: default + parental_block_host: family-block.dns.adguard.com + safebrowsing_block_host: standard-block.dns.adguard.com + rewrites: [] + safebrowsing_cache_size: 1048576 + safesearch_cache_size: 1048576 + parental_cache_size: 1048576 + cache_time: 30 + filters_update_interval: 1 + blocked_response_ttl: 10 + filtering_enabled: true + parental_enabled: true + safebrowsing_enabled: true + protection_enabled: true clients: runtime_sources: whois: true @@ -233,99 +262,208 @@ clients: dhcp: true hosts: true persistent: - - name: Buero-PC - tags: [] + - safe_search: + enabled: false + bing: false + duckduckgo: false + google: false + pixabay: false + yandex: false + youtube: false + blocked_services: + schedule: + time_zone: Europe/Berlin + ids: [] + name: Buero-PC ids: - 192.168.0.51 - blocked_services: [] + tags: [] upstreams: [] use_global_settings: false filtering_enabled: true parental_enabled: false - safesearch_enabled: false safebrowsing_enabled: true use_global_blocked_services: true - - name: FireTV-WZ - tags: [] + ignore_querylog: false + ignore_statistics: false + - safe_search: + enabled: false + bing: false + duckduckgo: false + google: false + pixabay: false + yandex: false + youtube: false + blocked_services: + schedule: + time_zone: Europe/Berlin + ids: [] + name: FireTV-WZ ids: - 192.168.0.56 - blocked_services: [] + tags: [] upstreams: [] use_global_settings: true filtering_enabled: false parental_enabled: false - safesearch_enabled: false safebrowsing_enabled: false use_global_blocked_services: true - - name: Fritz.Box - tags: [] + ignore_querylog: false + ignore_statistics: false + - safe_search: + enabled: false + bing: false + duckduckgo: false + google: false + pixabay: false + yandex: false + youtube: false + blocked_services: + schedule: + time_zone: Europe/Berlin + ids: [] + name: Fritz.Box ids: - 192.168.0.1 - blocked_services: [] + tags: [] upstreams: [] use_global_settings: false filtering_enabled: true parental_enabled: false - safesearch_enabled: false safebrowsing_enabled: true use_global_blocked_services: true - - name: Galaxy Tab-A7 - tags: [] + ignore_querylog: false + ignore_statistics: false + - safe_search: + enabled: false + bing: false + duckduckgo: false + google: false + pixabay: false + yandex: false + youtube: false + blocked_services: + schedule: + time_zone: Europe/Berlin + ids: [] + name: Galaxy Tab-A7 ids: - 192.168.0.59 - blocked_services: [] + tags: [] upstreams: [] use_global_settings: false filtering_enabled: true parental_enabled: false - safesearch_enabled: false safebrowsing_enabled: true use_global_blocked_services: true - - name: ROG - tags: [] + ignore_querylog: false + ignore_statistics: false + - safe_search: + enabled: false + bing: false + duckduckgo: false + google: false + pixabay: false + yandex: false + youtube: false + blocked_services: + schedule: + time_zone: Europe/Berlin + ids: [] + name: ROG ids: - - 192.168.0.66 - blocked_services: [] + - 192.168.0.98 + tags: [] upstreams: [] use_global_settings: false filtering_enabled: true parental_enabled: false - safesearch_enabled: false safebrowsing_enabled: true use_global_blocked_services: true - - name: S10-Lars + ignore_querylog: false + ignore_statistics: false + - safe_search: + enabled: false + bing: true + duckduckgo: true + google: true + pixabay: true + yandex: true + youtube: true + blocked_services: + schedule: + time_zone: Europe/Berlin + ids: [] + name: ROG-980 + ids: + - 192.168.0.58 tags: [] + upstreams: [] + use_global_settings: false + filtering_enabled: true + parental_enabled: false + safebrowsing_enabled: true + use_global_blocked_services: true + ignore_querylog: false + ignore_statistics: false + - safe_search: + enabled: false + bing: false + duckduckgo: false + google: false + pixabay: false + yandex: false + youtube: false + blocked_services: + schedule: + time_zone: Europe/Berlin + ids: [] + name: S10-Lars ids: - 192.168.0.42 - blocked_services: [] + tags: [] upstreams: [] use_global_settings: false filtering_enabled: true parental_enabled: false - safesearch_enabled: false safebrowsing_enabled: true use_global_blocked_services: true - - name: Sandra-P30 - tags: [] + ignore_querylog: false + ignore_statistics: false + - safe_search: + enabled: false + bing: false + duckduckgo: false + google: false + pixabay: false + yandex: false + youtube: false + blocked_services: + schedule: + time_zone: Europe/Berlin + ids: [] + name: Sandra-P30 ids: - 192.168.0.46 - blocked_services: [] + tags: [] upstreams: [] use_global_settings: true filtering_enabled: false parental_enabled: false - safesearch_enabled: false safebrowsing_enabled: false use_global_blocked_services: true -log_file: "" -log_max_backups: 0 -log_max_size: 100 -log_max_age: 3 -log_compress: false -log_localtime: false -verbose: false + ignore_querylog: false + ignore_statistics: false +log: + file: "" + max_backups: 0 + max_size: 100 + max_age: 3 + compress: false + local_time: false + verbose: false os: group: "" user: "" rlimit_nofile: 0 -schema_version: 17 +schema_version: 27 diff --git a/adguard/docker-compose.yml b/adguard/docker-compose.yml index a19650e..bd4118a 100644 --- a/adguard/docker-compose.yml +++ b/adguard/docker-compose.yml @@ -8,12 +8,9 @@ services: - ./conf:/opt/adguardhome/conf - /etc/localtime:/etc/localtime:ro ports: -# - 192.168.0.111:53:53/tcp -# - 192.168.0.111:53:53/udp - 53:53/tcp - 53:53/udp - 3000:3000/tcp -# - 3080:80/tcp environment: - TZ=Europe/Berlin restart: unless-stopped