From 89d3b7ac611049b7b152e3ceea3bb06b6282e2a4 Mon Sep 17 00:00:00 2001
From: Thomas Schneider <thomas@fsmpi.rwth-aachen.de>
Date: Wed, 25 Sep 2024 17:12:55 +0200
Subject: [PATCH] caddy: Separate site config templating task in its own file
This way, it can be easily included by other roles in order to provide Caddy
configuration.
---
caddy/tasks/main.yml | 10 +---------
caddy/tasks/site.yml | 15 +++++++++++++++
2 files changed, 16 insertions(+), 9 deletions(-)
create mode 100644 caddy/tasks/site.yml
diff --git a/caddy/tasks/main.yml b/caddy/tasks/main.yml
index b4735b4..a6afe80 100644
--- a/caddy/tasks/main.yml
+++ b/caddy/tasks/main.yml
@@ -36,21 +36,13 @@
- caddy
- name: Configure Caddy site drop-ins
- ansible.builtin.template:
- src: site.j2
- dest: /etc/caddy/sites-available/{{ item.key | urlencode }}
- validate: caddy validate --adapter caddyfile --config %s
- owner: root
- group: root
- mode: "0644"
+ ansible.builtin.include_tasks: site.yml
loop: "{{ caddy_local_sites | dict2items }}"
loop_control:
label: "{{ item.key }}"
vars:
site_name: "{{ item.key }}"
site_config: "{{ item.value }}"
- notify:
- - Reload Caddy
tags:
- caddy
- config
diff --git a/caddy/tasks/site.yml b/caddy/tasks/site.yml
new file mode 100644
index 0000000..a177972
--- /dev/null
+++ b/caddy/tasks/site.yml
@@ -0,0 +1,15 @@
+---
+
+- name: Configure Caddy site drop-in {{ site_name }}
+ ansible.builtin.template:
+ src: site.j2
+ dest: /etc/caddy/sites-available/{{ site_name | urlencode }}
+ validate: caddy validate --adapter caddyfile --config %s
+ owner: root
+ group: root
+ mode: "0644"
+ notify:
+ - Reload Caddy
+ tags:
+ - caddy
+ - config
--
GitLab