From 2524f0c46f375627e7c9db4222b732544befff9f Mon Sep 17 00:00:00 2001
From: Amritanshu <git@tanshu.com>
Date: Sun, 6 Sep 2026 14:30:32 +0530
Subject: [PATCH] Caddy role: single files/Caddyfile.j2 template (overlord
 pattern)

- template moved to ansible/files/Caddyfile.j2, tasks folded into main.yaml
---
 .../snippet.j2 => files/Caddyfile.j2}         |  0
 ansible/roles/caddy/tasks/main.yaml           | 11 +++++++++-
 ansible/roles/caddy/tasks/snippet.yaml        | 22 -------------------
 3 files changed, 10 insertions(+), 23 deletions(-)
 rename ansible/{roles/caddy/templates/snippet.j2 => files/Caddyfile.j2} (100%)
 delete mode 100644 ansible/roles/caddy/tasks/snippet.yaml

diff --git a/ansible/roles/caddy/templates/snippet.j2 b/ansible/files/Caddyfile.j2
similarity index 100%
rename from ansible/roles/caddy/templates/snippet.j2
rename to ansible/files/Caddyfile.j2
diff --git a/ansible/roles/caddy/tasks/main.yaml b/ansible/roles/caddy/tasks/main.yaml
index 1a89bb6..93debed 100644
--- a/ansible/roles/caddy/tasks/main.yaml
+++ b/ansible/roles/caddy/tasks/main.yaml
@@ -1,3 +1,12 @@
 ---
+- name: Read snippet from template
+  ansible.builtin.set_fact:
+    caddy_snippet_block: "{{ lookup('ansible.builtin.template', 'files/Caddyfile.j2') }}"
+
 - name: Install mozimo Caddy snippet (web + cms)
-  ansible.builtin.include_tasks: snippet.yaml
+  ansible.builtin.blockinfile:
+    path: "{{ caddyfile_path }}"
+    marker: "# {mark} Ansible managed Caddy snippet (mozimo web + cms)"
+    block: "{{ caddy_snippet_block }}"
+    insertafter: EOF
+  notify: "Reload Caddy"
diff --git a/ansible/roles/caddy/tasks/snippet.yaml b/ansible/roles/caddy/tasks/snippet.yaml
deleted file mode 100644
index 3ff69bb..0000000
--- a/ansible/roles/caddy/tasks/snippet.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: Read snippet from template
-  ansible.builtin.set_fact:
-    caddy_snippet_block: "{{ lookup('ansible.builtin.template', 'snippet.j2') }}"
-
-# migrate away from the older per-host marker blocks (pre dual-role snippet)
-- name: Remove legacy per-host snippet blocks
-  ansible.builtin.blockinfile:
-    path: "{{ caddyfile_path }}"
-    marker: "# {mark} Ansible managed Caddy snippet for {{ item }}"
-    state: absent
-  loop:
-    - "{{ www_host }}"
-    - "{{ cms_host }}"
-
-- name: Install mozimo Caddy snippet (web + cms)
-  ansible.builtin.blockinfile:
-    path: "{{ caddyfile_path }}"
-    marker: "# {mark} Ansible managed Caddy snippet (mozimo web + cms)"
-    block: "{{ caddy_snippet_block }}"
-    insertafter: EOF
-  notify: "Reload Caddy"