diff --git a/inventory/host_vars/beDebianMain.yml b/inventory/host_vars/beDebianMain.yml index 917a59e..262e1f0 100644 --- a/inventory/host_vars/beDebianMain.yml +++ b/inventory/host_vars/beDebianMain.yml @@ -35,8 +35,8 @@ ddns_override: dns_override: api_key: "{{ bitwarden_records_urmel_services['Pihole'].login.password }}" - domain: "pihole.arpa.be.urmel.de" - local_domain: "be.urmel.de" + domain: "pihole.arpa.urmel.de" + local_domains: ["be.urmel.de", "arpa.urmel.de"] domain_host: 192.168.1.2 domain_host_v6: fd00:0000:1000::2 @@ -47,7 +47,7 @@ homeassistant_override: zigbee2mqtt: zigbee_adapter_id: "usb-Itead_Sonoff_Zigbee_3.0_USB_Dongle_Plus_V2_f4b015d959f3ef1199c2c61b6d9880ab-if00-port0" version: latest - domain: "mqtt.arpa.be.urmel.de" + domain: "mqtt.arpa.urmel.de" auth_token: "{{ (bitwarden_records_urmel_services['Homeassistant'].fields | selectattr('name', '==', 'mqtt_auth_token') | first).value }}" mariadb: password: "{{ (bitwarden_records_urmel_services['Homeassistant'].fields | selectattr('name', '==', 'mariadb_password') | first).value }}" diff --git a/roles/pihole/defaults/main.yml b/roles/pihole/defaults/main.yml index c6c2717..3378b6b 100644 --- a/roles/pihole/defaults/main.yml +++ b/roles/pihole/defaults/main.yml @@ -4,4 +4,6 @@ dns_override: {} dns_defaults: api_key: "" domain: "" + local_domains: [] domain_host: "" + domain_host_v6: "" diff --git a/roles/pihole/handlers/main.yml b/roles/pihole/handlers/main.yml index 4fe9e61..5b51544 100644 --- a/roles/pihole/handlers/main.yml +++ b/roles/pihole/handlers/main.yml @@ -5,4 +5,5 @@ recreate: "always" services: ["pihole"] state: "restarted" - when: not _dns_already_restarted + + when: _dns_already_restarted is deffined and not _dns_already_restarted diff --git a/roles/pihole/templates/dmasq.conf/99-local-wildcard.conf.j2 b/roles/pihole/templates/dmasq.conf/99-local-wildcard.conf.j2 index 619c7a2..b5fdfdb 100644 --- a/roles/pihole/templates/dmasq.conf/99-local-wildcard.conf.j2 +++ b/roles/pihole/templates/dmasq.conf/99-local-wildcard.conf.j2 @@ -1,5 +1,5 @@ -address=/.{{ dns.local_domain }}/{{ dns.domain_host | default(ansible_facts.default_ipv4.address, true) }} -address=/.arpa.{{ dns.local_domain }}/{{ dns.domain_host | default(ansible_facts.default_ipv4.address, true) }} +{% for local_domain in dns.local_domains %} +address=/.{{ local_domain }}/{{ dns.domain_host | default(ansible_facts.default_ipv4.address, true) }} +address=/.{{ local_domain }}/{{ dns.domain_host_v6 | default(ansible_facts.default_ipv6.address, true) }} -address=/.{{ dns.local_domain }}/{{ dns.domain_host_v6 | default(ansible_facts.default_ipv6.address, true) }} -address=/.arpa.{{ dns.local_domain }}/{{ dns.domain_host_v6 | default(ansible_facts.default_ipv6.address, true) }} +{% endfor %}