Fix pihole install to work on raspberry and simplify on arch

3 files changed, 38 insertions, 13 deletions

diff --git a/roles/pihole/handlers/main.yml b/roles/pihole/handlers/main.yml
index 3e69d469..dca1ef52 100644
--- a/roles/pihole/handlers/main.yml
+++ b/roles/pihole/handlers/main.yml
@@ -8,3 +8,8 @@
   ansible.builtin.systemd_service:
     name: "systemd-resolved"
     state: "restarted"
+
+- name: "Restart NetworkManager"
+  ansible.builtin.systemd_service:
+    name: "NetworkManager"
+    state: "restarted"
diff --git a/roles/pihole/tasks/main.yml b/roles/pihole/tasks/main.yml
index 92f787df..84899e26 100644
--- a/roles/pihole/tasks/main.yml
+++ b/roles/pihole/tasks/main.yml
@@ -63,15 +63,35 @@
     cmd: "pihole -g"
   changed_when: false
 
-- name: "Set Pi-hole as system DNS"
-  ansible.builtin.lineinfile:
-    path: "/etc/systemd/resolved.conf"
-    regexp: "{{ item.regexp }}"
-    line: "{{ item.line }}"
-    backup: true
-  notify: "Restart systemd-resolved"
-  with_items:
-    - regexp: "^#?DNSStubListener="
-      line: "DNSStubListener=no"
-    - regexp: "^#?DNS="
-      line: "DNS=127.0.0.1"
+- name: "Configure pihole as system DNS"
+  notify:
+    - "Restart NetworkManager"
+    - "Restart systemd-resolved"
+  block:
+    - name: "Configure NetworkManager to disable DNS management"
+      ansible.builtin.copy:
+        dest: "/etc/NetworkManager/NetworkManager.conf"
+        owner: "root"
+        group: "root"
+        mode: "0644"
+        content: |
+          [main]
+          dns=none
+
+    - name: "Configure systemd-resolved for Pi-hole"
+      ansible.builtin.copy:
+        dest: "/etc/systemd/resolved.conf"
+        owner: "root"
+        group: "root"
+        mode: "0644"
+        content: |
+          [Resolve]
+          DNS=127.0.0.1#53
+          DNSStubListener=no
+
+    - name: "Configure system DNS"
+      ansible.builtin.file:
+        src: "/run/systemd/resolve/resolv.conf"
+        dest: "/etc/resolv.conf"
+        state: "link"
+        force: true
diff --git a/roles/pihole/templates/pihole.toml.j2 b/roles/pihole/templates/pihole.toml.j2
index 6d730d11..78467364 100644
--- a/roles/pihole/templates/pihole.toml.j2
+++ b/roles/pihole/templates/pihole.toml.j2
@@ -36,7 +36,7 @@ interface = "{{ pihole_interface }}"
 #       Permit all origins, accept on all interfaces. Make sure your Pi-hole is firewalled.
 #   - "NONE"
 #       Do not add any configuration concerning the listening mode to the dnsmasq config file.
-listeningMode = "SINGLE"
+listeningMode = "LOCAL"
 
 [dns.cache]
 size = 10000    # Cache size of the DNS server.