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

2021-02-17 13:48:55 -05:00
parent e510481e84 66064f0890
commit c4e1209452
7 changed files with 147 additions and 34 deletions
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@ -800,6 +800,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']