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/gitolite | |
| parent | prepare test setups for new acme/cert roles (diff) | |
nginx/vhost: major change in certifcate/tls handling (WIP)
Diffstat (limited to 'roles/gitolite')
| -rw-r--r-- | roles/gitolite/http/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/gitolite/http/templates/nginx-vhost.conf.j2 | 4 |
2 files changed, 4 insertions, 3 deletions
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 }}; |