finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not set up nginx-proxy auto-restart if not using Let's Encrypt

Browse Source 
Fix for d28bdb3258
This commit is contained in:
Slavi Pantaleev 2018-12-23 15:38:33 +02:00
parent 268e9b5b66
commit e033eb443b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/matrix-server/tasks/setup/setup_nginx_proxy.yml
View File

@ -62,7 +62,7 @@
src: "{{ role_path }}/templates/cron.d/matrix-nginx-proxy-periodic-restarter.j2" src: "{{ role_path }}/templates/cron.d/matrix-nginx-proxy-periodic-restarter.j2"
dest: "/etc/cron.d/matrix-nginx-proxy-periodic-restarter" dest: "/etc/cron.d/matrix-nginx-proxy-periodic-restarter"
mode: 0600 mode: 0600
when: matrix_nginx_proxy_enabled when: "matrix_nginx_proxy_enabled and matrix_ssl_retrieval_method == 'lets-encrypt'"
# #
# Tasks related to getting rid of matrix-nginx-proxy (if it was previously enabled) # Tasks related to getting rid of matrix-nginx-proxy (if it was previously enabled)
@ -87,4 +87,4 @@
file: file:
path: "/etc/cron.d/matrix-nginx-proxy-periodic-restarter" path: "/etc/cron.d/matrix-nginx-proxy-periodic-restarter"
state: absent state: absent
when: "not matrix_nginx_proxy_enabled" when: "not matrix_nginx_proxy_enabled or matrix_ssl_retrieval_method != 'lets-encrypt'"

2
roles/matrix-server/tasks/setup/ssl/setup_ssl_lets_encrypt.yml
View File

@ -4,6 +4,8 @@
# Tasks related to setting up Let's Encrypt's management of certificates # Tasks related to setting up Let's Encrypt's management of certificates
# #
- debug: var="matrix_ssl_retrieval_method"
- name: (Deprecation) Fail if using outdated configuration - name: (Deprecation) Fail if using outdated configuration
fail: fail:
msg: "You're using the `host_specific_matrix_ssl_support_email` variable, which has been superseded by `host_specific_matrix_ssl_lets_encrypt_support_email`. Please change your configuration to use the new name!" msg: "You're using the `host_specific_matrix_ssl_support_email` variable, which has been superseded by `host_specific_matrix_ssl_lets_encrypt_support_email`. Please change your configuration to use the new name!"