From baa6d99fd034c7c442a57c7d24eba5a1bf6c7fac Mon Sep 17 00:00:00 2001 From: Thomas Daley Date: Wed, 7 Jun 2023 08:59:13 -0700 Subject: [PATCH 1/2] override app_name in every task that needs it, for this role --- tasks/deploy.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml index d1de0dd..5fe6ae1 100644 --- a/tasks/deploy.yaml +++ b/tasks/deploy.yaml @@ -1,10 +1,14 @@ - include_role: name: application tasks_from: make_config_dir + vars: + app_name: traefik - include_role: name: application tasks_from: make_data_dir + vars: + app_name: traefik - name: Ensure directories exists file: @@ -16,6 +20,8 @@ - '{{ config_dir }}/dynamic' - '{{ config_dir }}/certs' - '{{ data_dir }}/acme' + vars: + app_name: traefik - name: Render public certificates copy: @@ -25,6 +31,8 @@ loop_control: label: "{{ item.common_name }}.crt" when: traefik_certs is defined + vars: + app_name: traefik - name: Render private keys copy: @@ -34,16 +42,22 @@ loop_control: label: "{{ item.common_name }}.key" when: traefik_certs is defined + vars: + app_name: traefik - name: 'Render dynamic configuration for TLS Certs to {{ config_dir }}/dynamic/certs.yaml' template: src: certs.yaml dest: "{{ config_dir }}/dynamic/certs.yaml" + vars: + app_name: traefik - name: 'Copy dynamic configuration from variable to {{ config_dir }}/dynamic/config.yaml' copy: content: '{{ traefik_config }}' dest: "{{ config_dir }}/dynamic/config.yaml" + vars: + app_name: traefik - name: Allow port 80 (HTTP) ufw: From b0742ee52e905519c43510d8e6a4211afdcd14d3 Mon Sep 17 00:00:00 2001 From: Thomas Daley Date: Wed, 7 Jun 2023 09:05:25 -0700 Subject: [PATCH 2/2] Add default for internal ACME resolver --- defaults/main.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/defaults/main.yaml b/defaults/main.yaml index 5420862..2f5c925 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,3 +1,4 @@ +traefik_cert_resolver: step-ca traefik_certs: [] traefik_config: {} traefik_network: traefik_net