Sfoglia il codice sorgente

Merge pull request #322 from aaronraimist/integrations-manager-well-known

Implement MSC1957: Integration manager discovery
pull/325/head
Slavi Pantaleev 6 anni fa
committed by GitHub
parent
commit
8cd51ad1ab
Non sono state trovate chiavi note per questa firma nel database ID Chiave GPG: 4AEE18F83AFDEB23
4 ha cambiato i file con 17 aggiunte e 1 eliminazioni
  1. +1
    -1
      examples/caddy/matrix-dimension
  2. +3
    -0
      group_vars/matrix_servers
  3. +3
    -0
      roles/matrix-base/defaults/main.yml
  4. +10
    -0
      roles/matrix-base/templates/static-files/well-known/matrix-client.j2

+ 1
- 1
examples/caddy/matrix-dimension Vedi File

@@ -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
} }
} }

+ 3
- 0
group_vars/matrix_servers Vedi 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
- 0
roles/matrix-base/defaults/main.yml Vedi 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"




+ 10
- 0
roles/matrix-base/templates/static-files/well-known/matrix-client.j2 Vedi File

@@ -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 %}
} }

Caricamento…
Annulla
Salva