From e1616671e2d9e604b51464d9ab24ed66f9452f5b Mon Sep 17 00:00:00 2001
From: Ahmed Abdelhalim <pm@a14m.dev>
Date: Fri, 12 Jun 2026 12:15:41 +0200
Subject: Fix handler order issue in releasing port 53 bind

---
 roles/pihole/handlers/main.yml |  6 ------
 roles/pihole/tasks/main.yml    | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'roles/pihole')

diff --git a/roles/pihole/handlers/main.yml b/roles/pihole/handlers/main.yml
index 87e77475..1cad8eff 100644
--- a/roles/pihole/handlers/main.yml
+++ b/roles/pihole/handlers/main.yml
@@ -1,10 +1,4 @@
 ---
-- name: "Restart pihole"
-  become: true
-  ansible.builtin.systemd_service:
-    name: "pihole-FTL"
-    state: "restarted"
-
 - name: "Restart systemd-resolved"
   become: true
   ansible.builtin.systemd_service:
diff --git a/roles/pihole/tasks/main.yml b/roles/pihole/tasks/main.yml
index 9757bd0e..3184860d 100644
--- a/roles/pihole/tasks/main.yml
+++ b/roles/pihole/tasks/main.yml
@@ -136,6 +136,20 @@
         state: "link"
         force: true
 
+- name: "Flush handlers before restarting pihole-FTL"
+  # systemd-resolved must release port 53 before pihole-FTL binds it.
+  # flush_handlers here makes that ordering a structural guarantee rather than
+  # relying on handler definition order.
+  ansible.builtin.meta: flush_handlers
+
+- name: "Restart pihole-FTL"
+  become: true
+  ansible.builtin.systemd_service:
+    name: "pihole-FTL"
+    state: "restarted"
+  tags:
+    - molecule-idempotence-notest
+
 - name: "Create pihole nginx configurations"
   become: true
   when: pihole_by_nginx is defined and pihole_by_nginx != ""
-- 
cgit v1.2.3