diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2023-08-09 14:38:23 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2023-08-20 22:12:03 +0200 |
| commit | bc98352d3e331003db625be96139b3c1f95f63b2 (patch) | |
| tree | 6f05ce12309fb46aaa9c9eee692573b49b692e4d /roles/apps/collabora | |
| parent | prepare test setups for new acme/cert roles (diff) | |
nginx/vhost: major change in certifcate/tls handling (WIP)
Diffstat (limited to 'roles/apps/collabora')
| -rw-r--r-- | roles/apps/collabora/code/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/apps/collabora/code/templates/nginx-vhost.conf.j2 | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/roles/apps/collabora/code/tasks/main.yml b/roles/apps/collabora/code/tasks/main.yml index db28bb65..8f4acc76 100644 --- a/roles/apps/collabora/code/tasks/main.yml +++ b/roles/apps/collabora/code/tasks/main.yml @@ -53,7 +53,8 @@ nginx_vhost: name: "collabora-code-{{ item.key }}" content: "{{ lookup('template', 'nginx-vhost.conf.j2') }}" - acme: true + tls: + certificate_provider: "{{ acme_client }}" hostnames: - "{{ item.value.hostname }}" include_role: diff --git a/roles/apps/collabora/code/templates/nginx-vhost.conf.j2 b/roles/apps/collabora/code/templates/nginx-vhost.conf.j2 index 04358976..8dd67fb7 100644 --- a/roles/apps/collabora/code/templates/nginx-vhost.conf.j2 +++ b/roles/apps/collabora/code/templates/nginx-vhost.conf.j2 @@ -3,7 +3,7 @@ server { listen [::]:80; server_name {{ item.value.hostname }}; - 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.hostname }}; - 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 }}; |