Merge branch 'master' into synapse-workers

2021-02-16 17:31:40 +02:00
parent 61e427d690 521160c12f
commit daae74b074
6 changed files with 146 additions and 32 deletions
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@ -770,6 +770,8 @@ matrix_dimension_database_password: "{{ matrix_synapse_macaroon_secret_key | pas

 matrix_etherpad_enabled: false

+matrix_etherpad_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:9001' }}"
+
 matrix_etherpad_systemd_required_services_list: |
  {{
    ['docker.service']