diff --git a/adguard/conf/AdGuardHome.yaml b/adguard/conf/AdGuardHome.yaml index 3d09d72..7c77b26 100644 --- a/adguard/conf/AdGuardHome.yaml +++ b/adguard/conf/AdGuardHome.yaml @@ -39,8 +39,7 @@ dns: - 8.8.8.8 - 8.8.4.4 fallback_dns: [] - all_servers: false - fastest_addr: false + upstream_mode: load_balance fastest_timeout: 1s allowed_clients: [] disallowed_clients: [] @@ -183,16 +182,15 @@ user_rules: - /^r[0-9]-*sn-[a-z0-9]*-[0-9a-z]{4}\.googlevideo\.com/ - /^r[0-9]{1,2}-*sn-[a-z0-9]*-[0-9a-z]{4}.googlevideo.com/ - /^rr[0-9]-*sn-[a-z0-9]*-[0-9a-z]{4}\.googlevideo\.com/ + - '##' + - '# PandaSecurity' + - '##' + - '||eventtrack.pandasecurity.com^$important' + - '#####' + - '# sonstige sperren' + - '#####' - '@@||ad.doubleclick.net^$important' - '@@||app-measurement.com^$important' - - '!@@||www.googletagmanager.com^$important' - - '!@@||www.google-analytics.com^$important' - - '!@@||as.bild.de^$important' - - '!@@||axelspringerse.demdex.net^$important' - - '!@@||adnxs-simple.com^$important' - - '!@@||a.hstrck.com^$important' - - '!@@||cdn.cxense.com^$important' - - '!@@||cm.everesttech.net^$important' - '@@||benefits.sovendus.com^$important' - '@@||fhdi3gj7.r.us-east-1.awstrack.me^$important' - '@@||t.notifications.groupe-pvcp.com^$important' @@ -207,7 +205,10 @@ user_rules: - '@@||as.bild.de^$important' - '@@||click.cptrack.de^$important' - '@@||lavieenrose.com^$important' - - '||eventtrack.pandasecurity.com^$important' + - '@@||fast.skydeutschland.demdex.net^$client=''ROG''' + - '@@||email.golfpost.de^$important' + - '@@||adservice.google.com^$important' + - '@@||rd.bizrate.com^$important' - '@@||telemetry-in.battle.net^$important' - '#' - '## Sperre für Luminar ' @@ -215,26 +216,6 @@ user_rules: - '||auth.macphun.com^$important' - '||luminar3win.update.skylum.com^$important' - '||luminar3.s3-accelerate.amazonaws.com^$important' - - '||luminar4win.update.skylum.com^$important' - - '||luminar4.s3-accelerate.amazonaws.com^$important' - - '||stats-api.skylum.com^$important' - - '||geotargetly-1a441.appspot.com^$important' - - '||fx.macphun.com^$important' - - '||canonicalizer.ucsuri.tcs^$important' - - '||auth.macphun.com^$important' - - '||stats-api.skylum.com^$important' - - '||api.photolemur.com^$important' - - '||media.macphun.com^$important' - - '||luminaraiwin.skylum.com^$important' - - '||luminarneowin.skylum.com^$important' - - '@@||fast.skydeutschland.demdex.net^$client=''ROG''' - - '||shepherd.ff.avast.com^$important' - - '||analytics.ff.avast.com^$important' - - '||v7event.stats.avast.com^$important' - - '||ncc.avast.com^$important' - - '@@||email.golfpost.de^$important' - - '@@||adservice.google.com^$important' - - '@@||rd.bizrate.com^$important' - "" dhcp: enabled: false @@ -308,6 +289,7 @@ clients: - 192.168.0.51 tags: [] upstreams: [] + uid: 018d7fa4-2a1d-71e0-9a76-f7f93da1e64d upstreams_cache_size: 0 upstreams_cache_enabled: false use_global_settings: false @@ -334,6 +316,7 @@ clients: - 192.168.0.56 tags: [] upstreams: [] + uid: 018d7fa4-2a1d-7d6c-a1d4-2f005d7c17ab upstreams_cache_size: 0 upstreams_cache_enabled: false use_global_settings: true @@ -360,6 +343,7 @@ clients: - 192.168.0.1 tags: [] upstreams: [] + uid: 018d7fa4-2a1d-7f8d-95fe-fcfe6d363a29 upstreams_cache_size: 0 upstreams_cache_enabled: false use_global_settings: false @@ -386,6 +370,7 @@ clients: - 192.168.0.59 tags: [] upstreams: [] + uid: 018d7fa4-2a1d-7739-bbc2-bf9b979f9913 upstreams_cache_size: 0 upstreams_cache_enabled: false use_global_settings: false @@ -412,6 +397,7 @@ clients: - 192.168.0.98 tags: [] upstreams: [] + uid: 018d7fa4-2a1d-741f-9824-85cdb1315521 upstreams_cache_size: 0 upstreams_cache_enabled: false use_global_settings: false @@ -438,6 +424,7 @@ clients: - 192.168.0.58 tags: [] upstreams: [] + uid: 018d7fa4-2a1d-70b1-8f0b-e7be87a33423 upstreams_cache_size: 0 upstreams_cache_enabled: false use_global_settings: false @@ -464,6 +451,7 @@ clients: - 192.168.0.42 tags: [] upstreams: [] + uid: 018d7fa4-2a1d-7e3c-a8e5-2d70f8580abb upstreams_cache_size: 0 upstreams_cache_enabled: false use_global_settings: false @@ -490,6 +478,7 @@ clients: - 192.168.0.60 tags: [] upstreams: [] + uid: 018d7fa4-2a1d-7acf-aa55-c000293947bc upstreams_cache_size: 0 upstreams_cache_enabled: false use_global_settings: false @@ -516,6 +505,7 @@ clients: - 192.168.0.62 tags: [] upstreams: [] + uid: 018d7fa4-2a1d-7fb5-a762-4f4599510a9d upstreams_cache_size: 0 upstreams_cache_enabled: false use_global_settings: false @@ -542,6 +532,7 @@ clients: - 192.168.0.46 tags: [] upstreams: [] + uid: 018d7fa4-2a1d-729a-a02b-bb7bd6c6340f upstreams_cache_size: 0 upstreams_cache_enabled: false use_global_settings: true @@ -563,4 +554,4 @@ os: group: "" user: "" rlimit_nofile: 0 -schema_version: 27 +schema_version: 28 diff --git a/adguard/docker-compose.yml b/adguard/docker-compose.yml index bd4118a..98d38ca 100644 --- a/adguard/docker-compose.yml +++ b/adguard/docker-compose.yml @@ -2,11 +2,14 @@ version: '3.7' services: adguardhome: container_name: adguardhome + hostname: adguardhome image: adguard/adguardhome:latest volumes: - ./work:/opt/adguardhome/work - ./conf:/opt/adguardhome/conf - /etc/localtime:/etc/localtime:ro + cap_add: + - NET_ADMIN ports: - 53:53/tcp - 53:53/udp