Просмотр исходного кода

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

Fix for d28bdb3258
pull/54/head
Slavi Pantaleev 7 лет назад
Родитель
Сommit
e033eb443b
2 измененных файлов: 4 добавлений и 2 удалений
  1. +2
    -2
      roles/matrix-server/tasks/setup/setup_nginx_proxy.yml
  2. +2
    -0
      roles/matrix-server/tasks/setup/ssl/setup_ssl_lets_encrypt.yml

+ 2
- 2
roles/matrix-server/tasks/setup/setup_nginx_proxy.yml Просмотреть файл

@@ -62,7 +62,7 @@
src: "{{ role_path }}/templates/cron.d/matrix-nginx-proxy-periodic-restarter.j2"
dest: "/etc/cron.d/matrix-nginx-proxy-periodic-restarter"
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)
@@ -87,4 +87,4 @@
file:
path: "/etc/cron.d/matrix-nginx-proxy-periodic-restarter"
state: absent
when: "not matrix_nginx_proxy_enabled"
when: "not matrix_nginx_proxy_enabled or matrix_ssl_retrieval_method != 'lets-encrypt'"

+ 2
- 0
roles/matrix-server/tasks/setup/ssl/setup_ssl_lets_encrypt.yml Просмотреть файл

@@ -4,6 +4,8 @@
# 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
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!"


Загрузка…
Отмена
Сохранить