# HG changeset patch # User Luke Hoersten # Date 1689867649 18000 # Node ID 245f2e0933985d81a718ab53cfb90aa7f02dbe49 # Parent afd4595fe1afe8544b166d0ca4143e94f72ff30b Updated AdGuard schema from v6 to v24 diff -r afd4595fe1af -r 245f2e093398 adguard-home/templates/AdGuardHome.yaml.j2 --- a/adguard-home/templates/AdGuardHome.yaml.j2 Wed Jul 19 13:54:22 2023 -0500 +++ b/adguard-home/templates/AdGuardHome.yaml.j2 Thu Jul 20 10:40:49 2023 -0500 @@ -1,73 +1,118 @@ -bind_host: 0.0.0.0 -bind_port: {{adguard_home_port}} +http: + address: 0.0.0.0:{{adguard_home_port}} + session_ttl: 720h users: -- name: admin - password: $2a$10$Zs3krtMBhUxje0yHHIA/neADb56jsC/QlJHcjSxNVNtF72bBONJMW + - name: admin + password: $2a$10$Zs3krtMBhUxje0yHHIA/neADb56jsC/QlJHcjSxNVNtF72bBONJMW +auth_attempts: 5 +block_auth_min: 15 http_proxy: "" language: "" -rlimit_nofile: 0 +theme: auto debug_pprof: false -web_session_ttl: 720 dns: - bind_host: 0.0.0.0 + bind_hosts: + - 0.0.0.0 port: 53 - statistics_interval: 1 - querylog_enabled: true - querylog_interval: 90 - querylog_size_memory: 1000 anonymize_client_ip: false protection_enabled: true blocking_mode: default blocking_ipv4: "" blocking_ipv6: "" blocked_response_ttl: 10 + protection_disabled_until: null parental_block_host: family-block.dns.adguard.com safebrowsing_block_host: standard-block.dns.adguard.com ratelimit: 20 ratelimit_whitelist: [] refuse_any: true upstream_dns: - - https://dns10.quad9.net/dns-query + - https://dns10.quad9.net/dns-query + upstream_dns_file: "" bootstrap_dns: - - 9.9.9.10 - - 149.112.112.10 - - 2620:fe::10 - - 2620:fe::fe:10 + - 9.9.9.10 + - 149.112.112.10 + - 2620:fe::10 + - 2620:fe::fe:10 all_servers: false fastest_addr: false + fastest_timeout: 1s allowed_clients: [] disallowed_clients: [] blocked_hosts: [] + trusted_proxies: + - 127.0.0.0/8 + - ::1/128 cache_size: 4194304 cache_ttl_min: 0 cache_ttl_max: 0 + cache_optimistic: false bogus_nxdomain: [] aaaa_disabled: false enable_dnssec: false - edns_client_subnet: false + edns_client_subnet: + custom_ip: "" + enabled: false + use_custom: false + max_goroutines: 300 + handle_ddr: true + ipset: [] + ipset_file: "" + bootstrap_prefer_ipv6: false filtering_enabled: true filters_update_interval: 24 parental_enabled: false - safesearch_enabled: false safebrowsing_enabled: false safebrowsing_cache_size: 1048576 safesearch_cache_size: 1048576 parental_cache_size: 1048576 cache_time: 30 + safe_search: + enabled: false + bing: true + duckduckgo: true + google: true + pixabay: true + yandex: true + youtube: true rewrites: [] - blocked_services: [] + blocked_services: + schedule: + time_zone: Local + ids: [] + upstream_timeout: 10s + private_networks: [] + use_private_ptr_resolvers: true + local_ptr_upstreams: [] + use_dns64: false + dns64_prefixes: [] + serve_http3: false + use_http3_upstreams: false tls: enabled: false server_name: "" force_https: false port_https: 443 port_dns_over_tls: 853 + port_dns_over_quic: 853 + port_dnscrypt: 0 + dnscrypt_config_file: "" allow_unencrypted_doh: false - strict_sni_check: false certificate_chain: "" private_key: "" certificate_path: "" private_key_path: "" + strict_sni_check: false +querylog: + ignored: [] + interval: 2160h + size_memory: 1000 + enabled: true + file_enabled: true +statistics: + ignored: [] + interval: 24h + enabled: true filters: {% for filter in adguard_home_filters %} - enabled: true @@ -81,28 +126,65 @@ dhcp: enabled: false interface_name: "" - gateway_ip: "" - subnet_mask: "" - range_start: "" - range_end: "" - lease_duration: 86400 - icmp_timeout_msec: 1000 + local_domain_name: lan + dhcpv4: + gateway_ip: "" + subnet_mask: "" + range_start: "" + range_end: "" + lease_duration: 86400 + icmp_timeout_msec: 1000 + options: [] + dhcpv6: + range_start: "" + lease_duration: 86400 + ra_slaac_only: false + ra_allow_slaac: false clients: + runtime_sources: + whois: true + arp: true + rdns: false + dhcp: true + hosts: true + persistent: {% for client in adguard_home_clients %} -- name: {{client.name}} - tags: [] - ids: - - {{client.ip}} - use_global_settings: {{not client.bypass|default(true)}} - filtering_enabled: false - parental_enabled: false - safesearch_enabled: false - safebrowsing_enabled: false - use_global_blocked_services: {{not client.bypass|default(true)}} - blocked_services: [] - upstreams: [] + - safe_search: + enabled: false + bing: false + duckduckgo: false + google: false + pixabay: false + yandex: false + youtube: false + blocked_services: + schedule: + time_zone: Local + ids: [] + name: {{client.name}} + ids: + - {{client.ip}} + tags: [] + upstreams: [] + use_global_settings: {{not client.bypass|default(false)}} + filtering_enabled: false + parental_enabled: false + safebrowsing_enabled: false + use_global_blocked_services: false + ignore_querylog: false + ignore_statistics: false {% else %} [] {% endfor %} -log_file: "" -verbose: false -schema_version: 6 +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: 24