Simplify Caddy infrastructure to use file-based configuration instead of complex API registration system
This commit is contained in:
@@ -35,7 +35,6 @@
|
||||
- name: Create caddy user and group
|
||||
user:
|
||||
name: "{{ caddy_user }}"
|
||||
group: "{{ caddy_group }}"
|
||||
home: "{{ caddy_home }}"
|
||||
shell: /usr/bin/nologin
|
||||
system: yes
|
||||
@@ -47,10 +46,11 @@
|
||||
path: "{{ item }}"
|
||||
state: directory
|
||||
owner: "{{ caddy_user }}"
|
||||
group: "{{ caddy_group }}"
|
||||
group: "{{ caddy_user }}"
|
||||
mode: '0755'
|
||||
loop:
|
||||
- "{{ caddy_config_dir }}"
|
||||
- "{{ caddy_sites_enabled_dir }}"
|
||||
- "{{ caddy_data_dir }}"
|
||||
- "{{ caddy_log_dir }}"
|
||||
- "{{ caddy_web_root }}"
|
||||
@@ -61,22 +61,34 @@
|
||||
src: index.html.j2
|
||||
dest: "{{ caddy_default_site_root }}/index.html"
|
||||
owner: "{{ caddy_user }}"
|
||||
group: "{{ caddy_group }}"
|
||||
group: "{{ caddy_user }}"
|
||||
mode: '0644'
|
||||
|
||||
|
||||
|
||||
- name: Create systemd override directory
|
||||
- name: Create systemd service file for custom Caddy installation
|
||||
template:
|
||||
src: caddy.service.j2
|
||||
dest: /usr/lib/systemd/system/caddy.service
|
||||
mode: '0644'
|
||||
when: dns_challenge_needed | bool
|
||||
notify:
|
||||
- reload systemd
|
||||
- restart caddy
|
||||
|
||||
- name: Create systemd override directory (for standard installation)
|
||||
file:
|
||||
path: /etc/systemd/system/caddy.service.d
|
||||
state: directory
|
||||
mode: '0755'
|
||||
when: not dns_challenge_needed | bool
|
||||
|
||||
- name: Configure Caddy systemd override
|
||||
- name: Configure Caddy systemd override (for standard installation)
|
||||
template:
|
||||
src: systemd-override.conf.j2
|
||||
dest: /etc/systemd/system/caddy.service.d/override.conf
|
||||
mode: '0644'
|
||||
when: not dns_challenge_needed | bool
|
||||
notify:
|
||||
- reload systemd
|
||||
- restart caddy
|
||||
@@ -86,7 +98,7 @@
|
||||
src: Caddyfile.j2
|
||||
dest: "{{ caddy_config_file }}"
|
||||
owner: root
|
||||
group: "{{ caddy_group }}"
|
||||
group: "{{ caddy_user }}"
|
||||
mode: '0640'
|
||||
backup: yes
|
||||
notify: reload caddy
|
||||
|
||||
Reference in New Issue
Block a user