diff options
Diffstat (limited to 'adguard-home')
| -rw-r--r-- | adguard-home/defaults/main.yaml | 7 | ||||
| -rw-r--r-- | adguard-home/handlers/main.yaml | 2 | ||||
| -rw-r--r-- | adguard-home/templates/AdGuardHome.yaml.j2 | 34 |
3 files changed, 30 insertions, 13 deletions
diff --git a/adguard-home/defaults/main.yaml b/adguard-home/defaults/main.yaml index 9f284e1..4886ae9 100644 --- a/adguard-home/defaults/main.yaml +++ b/adguard-home/defaults/main.yaml @@ -3,3 +3,10 @@ adguard_home_arch: "arm" adguard_home_tar: "https://static.adguard.com/adguardhome/release/AdGuardHome_linux_{{adguard_home_arch}}.tar.gz" adguard_home_data_dir: "/var/lib/AdGuardHome" +adguard_home_filters: + - url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt + name: AdGuard Simplified Domain Names filter + id: 1 + - url: https://abp.oisd.nl + name: oisd.nl + id: 2 diff --git a/adguard-home/handlers/main.yaml b/adguard-home/handlers/main.yaml index 8929df9..e5b9f5a 100644 --- a/adguard-home/handlers/main.yaml +++ b/adguard-home/handlers/main.yaml @@ -2,4 +2,4 @@ - name: restart adguard home become: yes - systemd: name="AdGuardHome.service" enabled="yes" daemon_reload="yes" + systemd: name="AdGuardHome.service" enabled="yes" daemon_reload="yes" state="restarted" diff --git a/adguard-home/templates/AdGuardHome.yaml.j2 b/adguard-home/templates/AdGuardHome.yaml.j2 index 99e4806..6bbc72a 100644 --- a/adguard-home/templates/AdGuardHome.yaml.j2 +++ b/adguard-home/templates/AdGuardHome.yaml.j2 @@ -69,18 +69,13 @@ tls: certificate_path: "" private_key_path: "" filters: +{% for filter in adguard_home_filters %} - enabled: true - url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt - name: AdGuard Simplified Domain Names filter - id: 1 -- enabled: false - url: https://adaway.org/hosts.txt - name: AdAway - id: 2 -- enabled: false - url: https://www.malwaredomainlist.com/hostslist/hosts.txt - name: MalwareDomainList.com Hosts List - id: 4 + url: {{filter.url}} + name: {{filter.name}} + id: {{filter.id}} +{% else %} [] +{% endfor %} whitelist_filters: [] user_rules: [] dhcp: @@ -92,7 +87,22 @@ dhcp: range_end: "" lease_duration: 86400 icmp_timeout_msec: 1000 -clients: [] +clients: +{% for client in adguard_home_clients %} +- name: {{client.name}} + tags: [] + ids: + - {{client.ip}} + use_global_settings: {{not client.bypass}} + filtering_enabled: false + parental_enabled: false + safesearch_enabled: false + safebrowsing_enabled: false + use_global_blocked_services: {{not client.bypass}} + blocked_services: [] + upstreams: [] +{% else %} [] +{% endfor %} log_file: "" verbose: false schema_version: 6 |