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/gitolite/http/tasks/main.yml | 3 ++- roles/gitolite/http/templates/nginx-vhost.conf.j2 | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'roles/gitolite') diff --git a/roles/gitolite/http/tasks/main.yml b/roles/gitolite/http/tasks/main.yml index a3055902..1006283a 100644 --- a/roles/gitolite/http/tasks/main.yml +++ b/roles/gitolite/http/tasks/main.yml @@ -54,7 +54,8 @@ vars: nginx_vhost: name: "gitolite-{{ gitolite_instance }}" - acme: true + tls: + certificate_provider: "{{ acme_client }}" hostnames: "{{ gitolite_instances[gitolite_instance].http.hostnames }}" content: "{{ lookup('template', 'nginx-vhost.conf.j2') }}" include_role: diff --git a/roles/gitolite/http/templates/nginx-vhost.conf.j2 b/roles/gitolite/http/templates/nginx-vhost.conf.j2 index 3386d956..f656d48f 100644 --- a/roles/gitolite/http/templates/nginx-vhost.conf.j2 +++ b/roles/gitolite/http/templates/nginx-vhost.conf.j2 @@ -6,7 +6,7 @@ access_log /var/log/nginx/git-{{ gitolite_instance }}_access.log; error_log /var/log/nginx/git-{{ gitolite_instance }}_error.log; - include snippets/acmetool.conf; + include snippets/{{ acme_client }}.conf; location / { return 301 https://$host$request_uri; @@ -21,7 +21,7 @@ server { access_log /var/log/nginx/git-{{ gitolite_instance }}_access.log; error_log /var/log/nginx/git-{{ gitolite_instance }}_error.log; - 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 }}; -- cgit v1.2.3