cqrenet/matrix-docker-ansible-deploy
3
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2025-10-26 01:53:24 +00:00
Code Issues Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix/add/config

Browse Source
This commit is contained in:
anadahz
2018-11-23 00:58:32 +00:00
parent 792bed3f5a 9e07c83088
commit 4febb117f4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/matrix-server/defaults/main.yml
View File

@@ -28,7 +28,7 @@ matrix_identity_server_url: "https://{{ matrix_synapse_trusted_third_party_id_se
matrix_docker_network: "matrix" matrix_docker_network: "matrix"
matrix_synapse_docker_image: "matrixdotorg/synapse:v0.33.8" matrix_synapse_docker_image: "matrixdotorg/synapse:v0.33.9"
matrix_synapse_base_path: "{{ matrix_base_data_path }}/synapse" matrix_synapse_base_path: "{{ matrix_base_data_path }}/synapse"
matrix_synapse_config_dir_path: "{{ matrix_synapse_base_path }}/config" matrix_synapse_config_dir_path: "{{ matrix_synapse_base_path }}/config"
@@ -50,7 +50,7 @@ matrix_synapse_registration_shared_secret: "{{ matrix_synapse_macaroon_secret_ke
matrix_synapse_form_secret: "{{ matrix_synapse_macaroon_secret_key }}" matrix_synapse_form_secret: "{{ matrix_synapse_macaroon_secret_key }}"
# These are the identity servers that would be trusted by Synapse if mxisd is NOT enabled # These are the identity servers that would be trusted by Synapse if mxisd is NOT enabled
matrix_synapse_id_servers_public: ['vector.im', 'riot.im', 'matrix.org'] matrix_synapse_id_servers_public: ['vector.im', 'matrix.org']
# These are the identity servers that would be trusted by Synapse if mxisd IS enabled # These are the identity servers that would be trusted by Synapse if mxisd IS enabled
matrix_synapse_id_servers_own: "['{{ hostname_matrix }}']" matrix_synapse_id_servers_own: "['{{ hostname_matrix }}']"
@@ -258,7 +258,7 @@ matrix_corporal_debug: false
# you may wish to disable this. # you may wish to disable this.
matrix_riot_web_enabled: true matrix_riot_web_enabled: true
matrix_riot_web_docker_image: "avhost/docker-matrix-riot:v0.17.3" matrix_riot_web_docker_image: "avhost/docker-matrix-riot:v0.17.6"
matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web" matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"