From bc98352d3e331003db625be96139b3c1f95f63b2 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 9 Aug 2023 14:38:23 +0200 Subject: nginx/vhost: major change in certifcate/tls handling (WIP) --- roles/elevate/liquidtruth/tasks/main.yml | 3 ++- roles/elevate/media/tasks/nextcloud-app.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'roles/elevate') diff --git a/roles/elevate/liquidtruth/tasks/main.yml b/roles/elevate/liquidtruth/tasks/main.yml index 837d2fd0..aa73adb5 100644 --- a/roles/elevate/liquidtruth/tasks/main.yml +++ b/roles/elevate/liquidtruth/tasks/main.yml @@ -18,7 +18,8 @@ nginx_vhost: name: liquidtruth template: generic - acme: true + tls: + certificate_provider: "{{ acme_client }}" hostnames: "{{ liquidtruth_hostnames }}" locations: '/': diff --git a/roles/elevate/media/tasks/nextcloud-app.yml b/roles/elevate/media/tasks/nextcloud-app.yml index 2e533ec6..42a351e4 100644 --- a/roles/elevate/media/tasks/nextcloud-app.yml +++ b/roles/elevate/media/tasks/nextcloud-app.yml @@ -102,7 +102,8 @@ nginx_vhost: name: "nextcloud-{{ elevate_media_nextcloud_instance_name }}" template: generic - acme: true + tls: + certificate_provider: "{{ acme_client }}" hostnames: "{{ elevate_media_nextcloud_instance.hostnames }}" locations: '/': -- cgit v1.2.3 From 3cec59363cf5a89788186c860eea47f2a3e6ae7d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 15 Aug 2023 01:01:38 +0200 Subject: always use include_role for nginx/vhost --- roles/elevate/liquidtruth/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/elevate') diff --git a/roles/elevate/liquidtruth/tasks/main.yml b/roles/elevate/liquidtruth/tasks/main.yml index aa73adb5..9f1ef3ad 100644 --- a/roles/elevate/liquidtruth/tasks/main.yml +++ b/roles/elevate/liquidtruth/tasks/main.yml @@ -12,8 +12,6 @@ import_tasks: nodejs.yml - name: configure nginx vhost - import_role: - name: nginx/vhost vars: nginx_vhost: name: liquidtruth @@ -24,6 +22,8 @@ locations: '/': proxy_pass: "http://127.0.0.1:8080" + include_role: + name: nginx/vhost - name: create app user user: -- cgit v1.2.3