Updated caddy role to better detect between jinja & raw Caddyfile a…

…nd added a folder for file sharing
novateams · Feb 23, 2024 · ef7a67c · ef7a67c
1 parent 8703d99
commit ef7a67c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/nova/core/roles/caddy/defaults/main.yml b/nova/core/roles/caddy/defaults/main.yml
@@ -2,8 +2,7 @@
 docker_network: local-network
 
 # Caddy configuration modes
-caddy_template_caddyfile_with_vars: true
-caddy_template_caddyfile: false
+caddy_template_caddyfile: false # Set to true to use a custom Caddyfile template
 caddy_use_labels: false
 caddy_container_ports:
   - "80:80"

diff --git a/nova/core/roles/caddy/tasks/install.yml b/nova/core/roles/caddy/tasks/install.yml
@@ -28,6 +28,7 @@
     - "{{ caddy_config_folder }}/data"
     - "{{ caddy_config_folder }}/config"
     - "{{ caddy_config_folder }}/logs"
+    - "{{ caddy_config_folder }}/www"
     - "{{ caddy_certificates_folder }}"
 
 - name: Templating Caddy configuration files for {{ inventory_hostname }}...

diff --git a/nova/core/roles/caddy/tasks/main.yml b/nova/core/roles/caddy/tasks/main.yml
@@ -4,7 +4,7 @@
 
 - name: Including Caddyfile with variables mode tasks...
   ansible.builtin.include_tasks: caddyfile_with_vars.yml
-  when: caddy_template_caddyfile_with_vars
+  when: not caddy_template_caddyfile
 
 - name: Including Caddyfile template tasks...
   ansible.builtin.include_tasks: caddy_template.yml

diff --git a/nova/core/roles/caddy/templates/caddy.yml b/nova/core/roles/caddy/templates/caddy.yml
@@ -14,6 +14,7 @@ services:
       - /srv/caddy/data:/data/caddy
       - /srv/caddy/config:/config/caddy
       - /srv/caddy/logs:/srv/logs
+      - /srv/caddy/www:/srv/www
       - "{{ caddy_certificates_folder }}:/srv/certs"
       - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt