From b9773a59ebdcac30001e2aa9ccd0aed81d16224c Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 24 Feb 2022 11:00:05 +0100 Subject: [PATCH] Update to 2022-02-24 11:00 --- roles/freepbx/templates/dehydrated_hook.j2 | 2 +- roles/letsencrypt/templates/domains.txt.j2 | 3 +++ roles/repo_asterisk/defaults/main.yml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/freepbx/templates/dehydrated_hook.j2 b/roles/freepbx/templates/dehydrated_hook.j2 index a719053..567f576 100644 --- a/roles/freepbx/templates/dehydrated_hook.j2 +++ b/roles/freepbx/templates/dehydrated_hook.j2 @@ -11,7 +11,7 @@ if [ $1 == "{{ fpbx_letsencrypt_cert }}" ]; then if [ $(fwconsole list | grep -c certificates) == 1 ]; then fwconsole certificates --import fi - asterisk -R 'core restart gracefully' + asterisk -rx 'core restart gracefully' fi {% else %} diff --git a/roles/letsencrypt/templates/domains.txt.j2 b/roles/letsencrypt/templates/domains.txt.j2 index c1693e9..0380317 100644 --- a/roles/letsencrypt/templates/domains.txt.j2 +++ b/roles/letsencrypt/templates/domains.txt.j2 @@ -39,3 +39,6 @@ {% if pbs_letsencrypt_cert is defined and pbs_letsencrypt_cert not in letsencrypt_certs | default([]) | map(attribute='common_name') %} {{ pbs_letsencrypt_cert }} {% endif %} +{% if fpbx_letsencrypt_cert is defined and fpbx_letsencrypt_cert is string and fpbx_letsencrypt_cert not in letsencrypt_certs | default([]) | map(attribute='common_name') %} +{{ fpbx_letsencrypt_cert }} +{% endif %} diff --git a/roles/repo_asterisk/defaults/main.yml b/roles/repo_asterisk/defaults/main.yml index 3bd5d29..bde8591 100644 --- a/roles/repo_asterisk/defaults/main.yml +++ b/roles/repo_asterisk/defaults/main.yml @@ -1,2 +1,2 @@ --- -ast_version: 17 +ast_version: 18