pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Don't make it Dimension specific

Browse source
This commit is contained in:
Aaron Raimist 2019-12-09 22:23:56 -06:00
parent 5366aef0da
commit 2ea507e2ea
No known key found for this signature in database
GPG key ID: 37419210002890EF
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
group_vars/matrix_servers
View file

@ -319,6 +319,9 @@ matrix_dimension_enabled: false
# the Dimension HTTP port to the local host. # the Dimension HTTP port to the local host.
matrix_dimension_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:8184' }}" matrix_dimension_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:8184' }}"
matrix_integration_manager_rest_url: "{{ matrix_dimension_integrations_rest_url if matrix_dimension_enabled else None }}"
matrix_integration_manager_ui_url: "{{ matrix_dimension_integrations_ui_url if matrix_dimension_enabled else None }}"
###################################################################### ######################################################################
# #
# /matrix-dimension # /matrix-dimension

3
roles/matrix-base/defaults/main.yml
View file

@ -31,6 +31,9 @@ matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
matrix_identity_server_url: ~ matrix_identity_server_url: ~
matrix_integration_manager_rest_url: ~
matrix_integration_manager_ui_url: ~
# The Docker network that all services would be put into # The Docker network that all services would be put into
matrix_docker_network: "matrix" matrix_docker_network: "matrix"

6
roles/matrix-base/templates/static-files/well-known/matrix-client.j2
View file

@ -8,12 +8,12 @@
"base_url": "{{ matrix_identity_server_url }}" "base_url": "{{ matrix_identity_server_url }}"
} }
{% endif %} {% endif %}
{% if matrix_dimension_integrations_rest_url and matrix_dimension_integrations_ui_url %}, {% if matrix_integration_manager_rest_url and matrix_integration_manager_ui_url %},
"m.integrations": { "m.integrations": {
"managers": [ "managers": [
{ {
"api_url": "{{ matrix_dimension_integrations_rest_url }}", "api_url": "{{ matrix_integration_manager_rest_url }}",
"ui_url": "{{ matrix_dimension_integrations_ui_url }}" "ui_url": "{{ matrix_integration_manager_ui_url }}"
} }
] ]
} }