mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-24 18:08:28 +01:00
Merge pull request #322 from aaronraimist/integrations-manager-well-known
Implement MSC1957: Integration manager discovery
This commit is contained in:
commit
8cd51ad1ab
@ -3,7 +3,7 @@ https://dimension.DOMAIN {
|
|||||||
# If you wish to use Caddy's built-in Let's Encrypt support, you can also supply an email address here
|
# If you wish to use Caddy's built-in Let's Encrypt support, you can also supply an email address here
|
||||||
tls /matrix/ssl/config/live/dimension.DOMAIN/fullchain.pem /matrix/ssl/config/live/dimension.DOMAIN/privkey.pem
|
tls /matrix/ssl/config/live/dimension.DOMAIN/fullchain.pem /matrix/ssl/config/live/dimension.DOMAIN/privkey.pem
|
||||||
|
|
||||||
proxy / http://127.0.0.1:8134/ {
|
proxy / http://127.0.0.1:8184/ {
|
||||||
transparent
|
transparent
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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
|
||||||
|
@ -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"
|
||||||
|
|
||||||
|
@ -8,4 +8,14 @@
|
|||||||
"base_url": "{{ matrix_identity_server_url }}"
|
"base_url": "{{ matrix_identity_server_url }}"
|
||||||
}
|
}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if matrix_integration_manager_rest_url and matrix_integration_manager_ui_url %},
|
||||||
|
"m.integrations": {
|
||||||
|
"managers": [
|
||||||
|
{
|
||||||
|
"api_url": "{{ matrix_integration_manager_rest_url }}",
|
||||||
|
"ui_url": "{{ matrix_integration_manager_ui_url }}"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
{% endif %}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user