From c165f88126155b6dc10366f9118be7165a6c364e Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Thu, 22 Mar 2018 18:43:44 +0100 Subject: [PATCH] Manage multiple names with acme.sh --- templates/etc/nginx/sites-available/_base.j2 | 2 +- tests/test.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/etc/nginx/sites-available/_base.j2 b/templates/etc/nginx/sites-available/_base.j2 index ecbe0e7..2ba4ab0 100644 --- a/templates/etc/nginx/sites-available/_base.j2 +++ b/templates/etc/nginx/sites-available/_base.j2 @@ -17,7 +17,7 @@ {%- endif %} {%- endmacro %} {% macro ssl(ssl_name) %} -{% for sn in nginx_ssl_pairs if sn.name == ssl_name %} +{% for sn in nginx_ssl_pairs if ((sn.name is string and sn.name == ssl_name) or (sn.name.0 == ssl_name)) %} ssl_certificate {{ nginx_ssl_dir + '/' + ssl_name + '/' + ssl_name + '.crt' if sn.dest_cert is not defined else sn.dest_cert }}; ssl_certificate_key {{ nginx_ssl_dir + '/' + ssl_name + '/' + ssl_name + '.key' if sn.dest_key is not defined else sn.dest_key }}; {% endfor %} diff --git a/tests/test.yml b/tests/test.yml index f0f53d3..1e721e0 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -72,7 +72,8 @@ nginx_acmesh: true nginx_acmesh_test: true nginx_ssl_pairs: - - name: '{{ ngrok.stdout }}' + - name: + - '{{ ngrok.stdout }}' acme: true acme_port: 8888 - name: 'test-ssl-predeployed.local'