diff options
Diffstat (limited to 'roles/apps/etherpad-lite')
-rw-r--r-- | roles/apps/etherpad-lite/tasks/main.yml | 3 | ||||
-rw-r--r-- | roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2 | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/roles/apps/etherpad-lite/tasks/main.yml b/roles/apps/etherpad-lite/tasks/main.yml index 072a6c09..495a0387 100644 --- a/roles/apps/etherpad-lite/tasks/main.yml +++ b/roles/apps/etherpad-lite/tasks/main.yml @@ -114,7 +114,8 @@ nginx_vhost: name: "etherpad-lite-{{ item.key }}" content: "{{ lookup('template', 'nginx-vhost.conf.j2') }}" - acme: true + tls: + certificate_provider: "{{ acme_client }}" hostnames: "{{ item.value.hostnames }}" include_role: name: nginx/vhost diff --git a/roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2 b/roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2 index 0ac9d0f0..c572a7eb 100644 --- a/roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2 +++ b/roles/apps/etherpad-lite/templates/nginx-vhost.conf.j2 @@ -3,7 +3,7 @@ server { listen [::]:80; server_name {{ item.value.hostnames | join(' ') }}; - include snippets/acmetool.conf; + include snippets/{{ acme_client }}.conf; location / { return 301 https://$host$request_uri; @@ -15,7 +15,7 @@ server { listen [::]:443 ssl http2; server_name {{ item.value.hostnames | join(' ') }}; - include snippets/acmetool.conf; + include snippets/{{ acme_client }}.conf; include snippets/tls.conf; ssl_certificate {{ x509_certificate_path_fullchain }}; ssl_certificate_key {{ x509_certificate_path_key }}; |