diff --git a/roles/reverse_proxy/molecule/default/verify.yml b/roles/reverse_proxy/molecule/default/verify.yml index 8316e93..d28e355 100644 --- a/roles/reverse_proxy/molecule/default/verify.yml +++ b/roles/reverse_proxy/molecule/default/verify.yml @@ -6,7 +6,7 @@ tasks: - name: Slurp the rendered Caddyfile ansible.builtin.slurp: - src: /opt/services/reverse_proxy/Caddyfile + src: /opt/services/reverse_proxy/caddy/Caddyfile register: _caddyfile - name: Assert Caddyfile exists and contains expected content ansible.builtin.assert: diff --git a/roles/reverse_proxy/tasks/main.yml b/roles/reverse_proxy/tasks/main.yml index 74c5d19..a89fedc 100644 --- a/roles/reverse_proxy/tasks/main.yml +++ b/roles/reverse_proxy/tasks/main.yml @@ -6,10 +6,21 @@ mode: "0750" tags: [config] +- name: Ensure the Caddy config directory exists + ansible.builtin.file: + path: "{{ reverse_proxy__base_dir }}/caddy" + state: directory + mode: "0750" + tags: [config] + +# Render into a directory that is bind-mounted whole (./caddy -> /etc/caddy). Mounting +# the directory, not the single file, means an atomic template rewrite (which swaps the +# file inode) stays visible inside the running container, so `caddy reload` picks it up. +# A single-file bind mount pins the original inode and reload silently no-ops (ADR-024). - name: Render the Caddyfile ansible.builtin.template: src: Caddyfile.j2 - dest: "{{ reverse_proxy__base_dir }}/Caddyfile" + dest: "{{ reverse_proxy__base_dir }}/caddy/Caddyfile" mode: "0644" notify: reload caddy tags: [config] diff --git a/roles/reverse_proxy/templates/docker-compose.yml.j2 b/roles/reverse_proxy/templates/docker-compose.yml.j2 index 740d187..af34d49 100644 --- a/roles/reverse_proxy/templates/docker-compose.yml.j2 +++ b/roles/reverse_proxy/templates/docker-compose.yml.j2 @@ -12,7 +12,7 @@ services: - ./env {% endif %} volumes: - - ./Caddyfile:/etc/caddy/Caddyfile:ro + - ./caddy:/etc/caddy:ro - caddy_data:/data - caddy_config:/config networks: