From abf5e66531eaa6393b8aa7fea061268522dfb381 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 25 Jan 2023 10:01:18 -0800 Subject: [PATCH] letsencrypt: move the combined cert to a template content is "undefined" if using variables and you can't put a newline in it, so just move this to a simple template. Signed-off-by: Kevin Fenzi --- roles/letsencrypt/tasks/main.yml | 5 ++--- roles/letsencrypt/templates/combined.j2 | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 roles/letsencrypt/templates/combined.j2 diff --git a/roles/letsencrypt/tasks/main.yml b/roles/letsencrypt/tasks/main.yml index e986eb2011..c44c0bfdf2 100644 --- a/roles/letsencrypt/tasks/main.yml +++ b/roles/letsencrypt/tasks/main.yml @@ -137,10 +137,9 @@ when: certbot_addhost is defined - name: Install certificate bundle - copy: > + template: > dest=/etc/pki/tls/certs/{{site_name}}.bundle.cert - content="{{certbot_certificate.stdout} -certbot_chain.stdout}}" + src=combined.j2 owner=root group=root mode=0644 diff --git a/roles/letsencrypt/templates/combined.j2 b/roles/letsencrypt/templates/combined.j2 new file mode 100644 index 0000000000..30960062e1 --- /dev/null +++ b/roles/letsencrypt/templates/combined.j2 @@ -0,0 +1,2 @@ +{{certbot_certificate.stdout}} +{{certbot_chain.stdout}}