mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2025-05-08 12:06:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: mirror:a1efb78bcbc3a9205a59de3364f47192b6232f0f
Branches Tags
mirror:master
mirror:element-call-stack
mirror:element-call-integration
mirror:renovate/zeratax-matrix-registration-0.x
mirror:synapse-cache-tuning
mirror:HarHarLinks/hookshot-encryption
...
compare: mirror:c0559870b50ad9e3848533c10066f985ff4b3ae0
Branches Tags
mirror:master
mirror:element-call-stack
mirror:element-call-integration
mirror:renovate/zeratax-matrix-registration-0.x
mirror:synapse-cache-tuning
mirror:HarHarLinks/hookshot-encryption

4 Commits
a1efb78bcb ... c0559870b5

Author SHA1 Message Date
Slavi Pantaleev
c0559870b5 Make matrix-registration-bot not try to talk to the homeserver via matrix-traefik:8008 (matrix-internal-client-api) 
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3898#issuecomment-2561470366
 2024-12-25 16:46:49 +02:00
Slavi Pantaleev
75026d8c3d Update a few incorrect comments 2024-12-25 16:42:19 +02:00
Slavi Pantaleev
f3dd2c907d
Merge pull request #3906 from spantaleev/renovate/charset-normalizer-3.x 
Update dependency charset-normalizer to v3.4.1
 2024-12-25 16:36:05 +02:00
renovate[bot]
311607970d
Update dependency charset-normalizer to v3.4.1 2024-12-24 19:46:57 +00:00
4 changed files with 9 additions and 7 deletions
Show Stats Expand all files Collapse all files

6
group_vars/matrix_servers
View File

@ -2734,10 +2734,12 @@ matrix_bot_matrix_registration_bot_container_network: "{{ matrix_addons_containe
matrix_bot_matrix_registration_bot_container_additional_networks_auto: |- matrix_bot_matrix_registration_bot_container_additional_networks_auto: |-
{{ {{
([] if matrix_addons_homeserver_container_network == '' else [matrix_addons_homeserver_container_network]) ([matrix_homeserver_container_network] if matrix_bot_matrix_registration_bot_container_network != matrix_homeserver_container_network else [])
}} }}
matrix_bot_matrix_registration_bot_api_base_url: "{{ matrix_addons_homeserver_client_api_url }}" # Using `matrix_addons_homeserver_client_api_url` would not work here,
# because `matrix-traefik:8008` (matrix-internal-client-api) does not expose any `/_synapse` paths.
matrix_bot_matrix_registration_bot_api_base_url: "{{ matrix_homeserver_container_url }}"
###################################################################### ######################################################################
# #

2
i18n/requirements.txt
View File

@ -1,7 +1,7 @@
alabaster==1.0.0 alabaster==1.0.0
babel==2.16.0 babel==2.16.0
certifi==2024.12.14 certifi==2024.12.14
charset-normalizer==3.4.0 charset-normalizer==3.4.1
click==8.1.8 click==8.1.8
docutils==0.21.2 docutils==0.21.2
idna==3.10 idna==3.10

4
roles/custom/matrix-synapse-reverse-proxy-companion/templates/labels.j2
View File

@ -75,7 +75,7 @@ traefik.http.routers.matrix-synapse-reverse-proxy-companion-internal-client-api.
{% if matrix_synapse_reverse_proxy_companion_container_labels_public_client_synapse_client_api_enabled %} {% if matrix_synapse_reverse_proxy_companion_container_labels_public_client_synapse_client_api_enabled %}
############################################################ ############################################################
# # # #
# Public Synapse Admin API (/_synapse/client) # # Public Synapse Client API (/_synapse/client) #
# # # #
############################################################ ############################################################
@ -105,7 +105,7 @@ traefik.http.routers.matrix-synapse-reverse-proxy-companion-public-client-synaps
############################################################ ############################################################
# # # #
# /Public Synapse Admin API (/_synapse/client) # # /Public Synapse Client API (/_synapse/client) #
# # # #
############################################################ ############################################################
{% endif %} {% endif %}

4
roles/custom/matrix-synapse/templates/synapse/labels.j2
View File

@ -130,7 +130,7 @@ traefik.http.routers.matrix-synapse-internal-client-api.entrypoints={{ matrix_sy
{% if matrix_synapse_container_labels_public_client_synapse_client_api_enabled %} {% if matrix_synapse_container_labels_public_client_synapse_client_api_enabled %}
############################################################ ############################################################
# # # #
# Public Synapse Admin API (/_synapse/client) # # Public Synapse Client API (/_synapse/client) #
# # # #
############################################################ ############################################################
@ -160,7 +160,7 @@ traefik.http.routers.matrix-synapse-public-client-synapse-client-api.tls.certRes
############################################################ ############################################################
# # # #
# /Public Synapse Admin API (/_synapse/client) # # /Public Synapse Client API (/_synapse/client) #
# # # #
############################################################ ############################################################
{% endif %} {% endif %}