From de476418f4e7f34d2f9c16295c6619ed7f62e148 Mon Sep 17 00:00:00 2001 From: Arne Naessens Date: Fri, 20 May 2022 15:52:09 +0200 Subject: [PATCH 1/3] ADD: Adguard --- apps/adguard/config.json | 16 +++ apps/adguard/data/conf/AdGuardHome.yaml | 131 ++++++++++++++++++++++++ apps/adguard/docker-compose.yml | 17 +++ 3 files changed, 164 insertions(+) create mode 100644 apps/adguard/config.json create mode 100644 apps/adguard/data/conf/AdGuardHome.yaml create mode 100644 apps/adguard/docker-compose.yml diff --git a/apps/adguard/config.json b/apps/adguard/config.json new file mode 100644 index 00000000..f379ada6 --- /dev/null +++ b/apps/adguard/config.json @@ -0,0 +1,16 @@ +{ + "name": "Adguard", + "available": true, + "port": 8104, + "id": "adguard", + "description": "Adguard is the best way to get rid of annoying ads and online tracking and protect your computer from malware. Make your web surfing fast, safe and ad-free.", + "short_desc": "World's most advanced adblocker!", + "author": "ArneNaessens", + "source": "https://github:com/AdguardTeam", + "image": "https://avatars.githubusercontent.com/u/8361145?s=200&v=4", + "requirements": { + "ports": [53] + }, + "form_fields": { + } +} diff --git a/apps/adguard/data/conf/AdGuardHome.yaml b/apps/adguard/data/conf/AdGuardHome.yaml new file mode 100644 index 00000000..4fcefdb2 --- /dev/null +++ b/apps/adguard/data/conf/AdGuardHome.yaml @@ -0,0 +1,131 @@ +bind_host: 0.0.0.0 +bind_port: 80 +beta_bind_port: 0 +users: [] +auth_attempts: 5 +block_auth_min: 15 +http_proxy: "" +language: "" +debug_pprof: false +web_session_ttl: 720 +dns: + bind_hosts: + - 0.0.0.0 + port: 53 + statistics_interval: 1 + querylog_enabled: true + querylog_file_enabled: true + querylog_interval: 2160h + querylog_size_memory: 1000 + 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: 20 + ratelimit_whitelist: [] + refuse_any: true + upstream_dns: + - 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 + all_servers: false + fastest_addr: false + fastest_timeout: 1s + allowed_clients: [] + disallowed_clients: [] + blocked_hosts: + - version.bind + - id.server + - hostname.bind + 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 + max_goroutines: 300 + ipset: [] + 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 + rewrites: [] + blocked_services: [] + upstream_timeout: 10s + local_domain_name: lan + resolve_clients: true + use_private_ptr_resolvers: true + local_ptr_upstreams: [] +tls: + enabled: false + server_name: "" + force_https: false + port_https: 443 + port_dns_over_tls: 853 + port_dns_over_quic: 784 + port_dnscrypt: 0 + dnscrypt_config_file: "" + allow_unencrypted_doh: false + strict_sni_check: false + certificate_chain: "" + private_key: "" + certificate_path: "" + private_key_path: "" +filters: +- enabled: true + url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt + name: AdGuard DNS filter + id: 1 +- enabled: false + url: https://adaway.org/hosts.txt + name: AdAway Default Blocklist + id: 2 +whitelist_filters: [] +user_rules: [] +dhcp: + enabled: false + interface_name: "" + 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: [] +log_compress: false +log_localtime: false +log_max_backups: 0 +log_max_size: 100 +log_max_age: 3 +log_file: "" +verbose: false +os: + group: "" + user: "" + rlimit_nofile: 0 +schema_version: 12 diff --git a/apps/adguard/docker-compose.yml b/apps/adguard/docker-compose.yml new file mode 100644 index 00000000..ace474bc --- /dev/null +++ b/apps/adguard/docker-compose.yml @@ -0,0 +1,17 @@ + +version: "3.5" + +services: + adguardhome: + image: adguard/adguardhome + container_name: adguard + volumes: + - "${APP_DATA_DIR}/data/work:/opt/adguardhome/work" + - "${APP_DATA_DIR}/data/conf:/opt/adguardhome/conf" + restart: unless-stopped + networks: + - tipi_main_network + ports: + - 53:53/tcp + - 53:53/udp + - ${APP_PORT}:80 From a363ad8ecc1e6883332d16d42c739bf08572bd7b Mon Sep 17 00:00:00 2001 From: Arne Naessens Date: Fri, 20 May 2022 16:19:51 +0200 Subject: [PATCH 2/3] ADD: Adguard --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6d2c3883..5316de72 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Tipi is a personal homeserver orchestrator. It is running docker containers unde - [Tailscale](https://github.com/tailscale/tailscale) - The easiest, most secure way to use WireGuard and 2FA. - [Transmission](https://github.com/transmission/transmission) - Fast, easy, and free BitTorrent client - [Wireguard Easy](https://github.com/WeeJeWel/wg-easy) - WireGuard VPN + Web-based Admin UI +- [Adguard Home](https://github.com/AdguardTeam/AdGuardHome) - Adguard Home DNS adblocker ## 🛠 Installation ### Installation Requirements - Ubuntu 18.04 LTS or higher (or Debian 10) From 9bea6a9c52328449ac8aab3ffcfc6069cf70e646 Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Fri, 20 May 2022 18:05:40 +0200 Subject: [PATCH 3/3] Add static version for adguard --- apps/adguard/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/adguard/docker-compose.yml b/apps/adguard/docker-compose.yml index ace474bc..aeb0062a 100644 --- a/apps/adguard/docker-compose.yml +++ b/apps/adguard/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.5" services: adguardhome: - image: adguard/adguardhome + image: adguard/adguardhome:v0.107.6 container_name: adguard volumes: - "${APP_DATA_DIR}/data/work:/opt/adguardhome/work"