Private
Public Access
2
0

caddy: refact variables name, global options, add caddy_my_name

This commit is contained in:
2026-01-23 11:20:54 +03:00
parent 69b4bb6c88
commit c217cc8d7c
11 changed files with 560 additions and 505 deletions

View File

@@ -1,7 +1,11 @@
- name: Set sites defaults
ansible.builtin.set_fact:
caddy_sites_defaults: "{{ caddy_global_sites_defaults | combine(caddy_my_sites_defaults) }}"
- name: Create sites config directories
loop: "{{ caddy_sites }}"
ansible.builtin.file:
path: "{{ caddy_config_dir }}/sites/{{ item.name }}"
path: "{{ caddy_config_dir }}/sites/{{ item.id }}"
state: "directory"
group: "{{ caddy_system_group }}"
mode: "0750"
@@ -12,7 +16,7 @@
loop_var: "site"
ansible.builtin.template:
src: "templates/coraza.conf"
dest: "{{ caddy_config_dir }}/sites/{{ site.name }}/coraza.conf"
dest: "{{ caddy_config_dir }}/sites/{{ site.id }}/coraza.conf"
group: "{{ caddy_system_group }}"
mode: "0640"
notify:
@@ -24,7 +28,7 @@
loop_var: "site"
ansible.builtin.template:
src: "templates/crs-setup.conf"
dest: "{{ caddy_config_dir }}/sites/{{ site.name }}/crs-setup.conf"
dest: "{{ caddy_config_dir }}/sites/{{ site.id }}/crs-setup.conf"
group: "{{ caddy_system_group }}"
mode: "0640"
notify:
@@ -36,7 +40,7 @@
loop_var: "site"
ansible.builtin.template:
src: "templates/exclusions-request-before.conf"
dest: "{{ caddy_config_dir }}/sites/{{ site.name }}/exclusions-request-before.conf"
dest: "{{ caddy_config_dir }}/sites/{{ site.id }}/exclusions-request-before.conf"
group: "{{ caddy_system_group }}"
mode: "0640"
notify:
@@ -48,7 +52,7 @@
loop_var: "site"
ansible.builtin.template:
src: "templates/exclusions-response-after.conf"
dest: "{{ caddy_config_dir }}/sites/{{ site.name }}/exclusions-response-after.conf"
dest: "{{ caddy_config_dir }}/sites/{{ site.id }}/exclusions-response-after.conf"
group: "{{ caddy_system_group }}"
mode: "0640"
notify:
@@ -71,3 +75,10 @@
mode: "0640"
notify:
- "Restart Caddy"
- name: Enable and start Caddy
ansible.builtin.service:
name: "{{ caddy_my_name }}"
state: "started"
enabled: true
daemon_reload: true

View File

@@ -2,5 +2,5 @@
when: "not(caddy_config_only)"
ansible.builtin.include_tasks: "caddy_install.yml"
- name: Config Caddy
- name: Configure Caddy
ansible.builtin.include_tasks: "caddy_config.yml"