Merge branch 'master' into add-mx-puppet-groupme-gh

2021-02-14 13:41:16 -05:00
parent c15d5a58a9 894679750e
commit e510481e84
5 changed files with 43 additions and 16 deletions
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@ -1066,6 +1066,8 @@ matrix_ssl_domains_to_obtain_certificates_for: |
    ([matrix_server_fqn_grafana] if matrix_grafana_enabled else [])
    +
    ([matrix_domain] if matrix_nginx_proxy_base_domain_serving_enabled else [])
+    +
+    matrix_ssl_additional_domains_to_obtain_certificates_for
  }}

 matrix_ssl_architecture: "{{