diff --git a/nova/core/roles/caddy/defaults/main.yml b/nova/core/roles/caddy/defaults/main.yml index 79b9418e..96d80b52 100644 --- 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 index 4435e45f..556c2012 100644 --- 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 index d66131e3..9f55398d 100644 --- 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 index 46c0dffc..03ead3c4 100644 --- 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