Commit Graph

1271 Commits

Author SHA1 Message Date
Slavi Pantaleev
a9a1448f62 Add self-check for the matrix-corporal HTTP API (if enabled) 2024-01-13 15:29:47 +02:00
Slavi Pantaleev
5d76b91dc2 Restore matrix-corporal functionality when matrix-nginx-proxy is not involved 2024-01-13 15:29:47 +02:00
Slavi Pantaleev
48e6344c9e Merge branch 'master' into bye-bye-nginx-proxy 2024-01-13 10:25:35 +02:00
Slavi Pantaleev
22dce1d4cc Upgrade matrix-reminder-bot and lock it down via the new allowlist setting 2024-01-13 10:22:06 +02:00
Slavi Pantaleev
d6e91116ab Update documentation related to variables for prometheus-node-exporter/prometheus-postgres-exporter metrics exposure 2024-01-12 18:04:18 +02:00
Slavi Pantaleev
c468a860f8 Switch to exposing prometheus-postgres-exporter via native Traefik labels, not via matrix-prometheus-services-proxy-connect.. and remove matrix-prometheus-services-proxy-connect role
This requires at least `v0.14.0-2` of the `prometheus-postgres-exporter`
Ansible role.
2024-01-12 17:54:54 +02:00
Slavi Pantaleev
beb0f2387d Switch to exposing prometheus-node-exporter via native Traefik labels, not via matrix-prometheus-services-proxy-connect
This requires at least `v1.7.0-2` of the `prometheus-node-exporter`
Ansible role.
2024-01-12 17:41:54 +02:00
Slavi Pantaleev
7fba83924c Remove etherpad-proxy-connect role 2024-01-12 17:22:46 +02:00
Slavi Pantaleev
4018aa38b3 Move matrix-registration service to its own network and add native Traefik support 2024-01-12 17:17:12 +02:00
Slavi Pantaleev
13e47fc3f5 Remove matrix-nginx-proxy integration support from matrix-synapse-admin 2024-01-12 16:33:44 +02:00
Slavi Pantaleev
74099383cd Adapt external_prometheus.yml.example.j2 to our new metrics exposure setup 2024-01-12 13:01:06 +02:00
Slavi Pantaleev
934b73c849 Remove leftover Synapse metrics code for integrating with matrix-nginx-proxy 2024-01-12 12:57:28 +02:00
Slavi Pantaleev
c0308307e2 Make homeserver services sleep after startup, instead of all dependencies sleeping separately
This is an attempt at optimizing service startup.

The effect is most pronounced when many services are restarted one by one.
The systemd service manager role sometimes does this - for example when `just install-service synapse` runs.
In such cases, a 5-second delay for each Synapse worker service
(or other bridge/bot service that waits on the homeserver) quickly adds up to a lot.

When services are all stopped fully and then started, the effect is not so pronounced, because
`matrix-synapse.service` starts first and pulls all worker services (defined as `Wants=` for it).
Later on, when the systemd service manager role "starts" these worker services, they're started already.
Even if they had a 5-second wait each, it would have happened in parallel.
2024-01-12 12:45:18 +02:00
Slavi Pantaleev
41a52945d6 Add support for exposing metrics for Synapse workers 2024-01-12 12:16:06 +02:00
Slavi Pantaleev
22f5f0ba75 Add support for exposing metrics for Synapse (without workers) 2024-01-12 12:15:57 +02:00
Slavi Pantaleev
3556dd77ef Use variables instead of hardcoding service port numbers in labels for matrix-synapse 2024-01-12 09:31:31 +02:00
Slavi Pantaleev
a92efa46ad Merge branch 'master' into bye-bye-nginx-proxy 2024-01-11 18:57:44 +02:00
Slavi Pantaleev
b38b00bbd7 Upgrade mautrix-signal (959eb7eaf9 -> de8c8d97c2)
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3090

Related to https://github.com/mautrix/signal/issues/422
2024-01-11 18:57:16 +02:00
Slavi Pantaleev
1831f09f2b Shorten Traefik router names (*-endpoint -> *) 2024-01-11 12:35:41 +02:00
Slavi Pantaleev
f9faaae26c Shorten Traefik router name (*-well-known-endpoint -> *-well-known) 2024-01-11 12:35:39 +02:00
Slavi Pantaleev
18254cd0b2 Remvoe all Traefik labels from matrix-nginx-proxy and update docs for delegation via SRV 2024-01-11 12:31:56 +02:00
Slavi Pantaleev
ce2f541deb Switch all remaining container volume mounting from -v to --mount
`--mount` is safer, as `-v` has the side-effect of creating the "source"
destination as a directory if it doesn't exist yet.
We don't need such magic.
2024-01-11 12:16:27 +02:00
Slavi Pantaleev
881c20bf25 Switch matrix_dendrite_container_additional_volumes from using -v to --mount
Related to e5130372b9.

Depending on the `options` that people provide, this may break
compatibility.
2024-01-11 12:15:32 +02:00
Slavi Pantaleev
e5130372b9 Switch matrix_synapse_container_additional_volumes from using -v to --mount
Depending on the `options` that people provide, this may break
compatibility.
2024-01-11 12:12:44 +02:00
Slavi Pantaleev
c4d6144bb9 Add metrics-exposure support for Dendrite 2024-01-11 12:02:15 +02:00
Slavi Pantaleev
f257cd9fbe Fix a few incorrect service names in labels for matrix-synapse/matrix-synapse-reverse-proxy-companion 2024-01-11 11:58:20 +02:00
Slavi Pantaleev
0701a01825 Fix service name in federation labels for Dendrite 2024-01-11 11:41:27 +02:00
Slavi Pantaleev
4873af18a8 Fix service name in federation labels for Conduit 2024-01-11 11:41:15 +02:00
Slavi Pantaleev
bea41e28b0 Remove Dendrite support from matrix-nginx-proxy 2024-01-11 11:33:33 +02:00
Slavi Pantaleev
d8eb768e03 Add native Traefik support to matrix-dendrite 2024-01-11 11:30:42 +02:00
Slavi Pantaleev
f78adfde47 Remove Synapse support from matrix-nginx-proxy 2024-01-11 09:24:01 +02:00
Slavi Pantaleev
030e8065e4 Remove Conduit support from matrix-nginx-proxy 2024-01-11 09:21:00 +02:00
Slavi Pantaleev
9ae8ccac36 Add matrix_conduit_hostname 2024-01-11 09:17:13 +02:00
Slavi Pantaleev
4639eebf12 Add native Traefik support to matrix-conduit 2024-01-11 08:56:51 +02:00
Slavi Pantaleev
3e0e92bdf7 Do not use matrix_synapse_reverse_proxy_companion_ variables in the matrix-synapse role 2024-01-11 08:49:57 +02:00
Slavi Pantaleev
53b5d8286f Merge branch 'master' into bye-bye-nginx-proxy 2024-01-11 08:35:53 +02:00
Slavi Pantaleev
95e505106b Restore matrix_mautrix_signal_appservice_bot_username usage
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3088

Looks like the migration to the Go-based Signal bridge hardcoded the
`signalbot` username instead of using the variable we had.
Related to: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/3041
2024-01-11 07:55:41 +02:00
Slavi Pantaleev
6766216fcb Wire Conduit to advertise usage of the Coturn TURN server
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3089
2024-01-11 07:52:48 +02:00
Slavi Pantaleev
f54b68956d Adapt matrix-media-repo to new container network setup, etc. 2024-01-09 18:52:38 +02:00
Slavi Pantaleev
fc79afadd1 Merge branch 'master' into bye-bye-nginx-proxy 2024-01-09 16:07:54 +02:00
Slavi Pantaleev
3e19c8b102 Define matrix_media_repo_homeservers_auto in group vars
This is mostly so as to avoid referring to variables from other roles,
like `matrix_nginx_proxy_proxy_matrix_client_api_addr_with_container`.
2024-01-09 16:07:23 +02:00
Slavi Pantaleev
c7a637bfde Merge branch 'master' into bye-bye-nginx-proxy 2024-01-09 16:03:01 +02:00
Slavi Pantaleev
883afa11dc Do not hardcode devture_postgres_identifier in matrix-media-repo role
This should come (and already does) from group_vars/matrix_servers
2024-01-09 16:02:31 +02:00
Slavi Pantaleev
f83c221fda Merge branch 'master' into bye-bye-nginx-proxy 2024-01-09 15:38:23 +02:00
Slavi Pantaleev
7ad5321f54 Make sure ma1sd uninstallation tasks also run on setup-all 2024-01-09 15:37:51 +02:00
Slavi Pantaleev
aea66442a1 Move matrix-ma1sd to its own container network and add native Traefik support 2024-01-09 15:27:13 +02:00
Slavi Pantaleev
81f1c4683b Use Path() intead of PathPrefix() for ldap-registration-proxy endpoint 2024-01-09 13:16:20 +02:00
Slavi Pantaleev
7441fff210 Fix regex in atrix_ldap_registration_proxy_container_labels_registration_endpoint_path_prefix 2024-01-09 13:15:28 +02:00
Slavi Pantaleev
b2b373bab3 Merge branch 'master' into bye-bye-nginx-proxy 2024-01-09 12:06:09 +02:00
Slavi Pantaleev
0c048c7592 Fix ma1sd self-building and make it not require gradle 2024-01-09 12:06:01 +02:00
Slavi Pantaleev
300e67c03d Split matrix_ldap_registration_proxy_systemd_wanted_services_list and update docs a bit 2024-01-09 11:51:15 +02:00
Slavi Pantaleev
61216d51cc Move matrix-ldap-registration-proxy to its own container network and add native Traefik support
This also makes it handle the `/_matrix/client/v3/register` endpoint,
not just `/_matrix/client/r0/register`
2024-01-09 11:28:20 +02:00
Slavi Pantaleev
9171b8df91 Merge branch 'master' into bye-bye-nginx-proxy 2024-01-09 10:49:00 +02:00
Slavi Pantaleev
998e9ce655 Revert "Auto-generate matrix_bot_matrix_registration_bot_bot_password via group vars"
This reverts commit bf95ad2235.

This was a bad idea.
It's better to have people manually define the password.

Otherwise, `matrix_homeserver_generic_secret_key` changing some day in
the future would break the bot and one would have to figure out how to
reset its password manually.

Using an explicit password is more stable.
2024-01-09 10:22:20 +02:00
Slavi Pantaleev
bf95ad2235 Auto-generate matrix_bot_matrix_registration_bot_bot_password via group vars 2024-01-09 10:19:57 +02:00
Pierre 'McFly' Marty
5caf1fef1d
chore(deps): update signal bridge version + config (#3084)
* chore(deps): update signal bridge version + config

* style(deps): rename default note to self config variable

* Add to_json for additional safety

---------

Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2024-01-09 10:07:46 +02:00
Slavi Pantaleev
4c7ee34194 Rename variable for consistency (matrix_hookshot_ident -> matrix_hookshot_identifier) 2024-01-09 09:56:21 +02:00
Slavi Pantaleev
fce84a2b3c Rename variable for consistency (matrix_homeserver_proxy_ident -> matrix_homeserver_proxy_identifier) 2024-01-09 09:54:42 +02:00
Slavi Pantaleev
2f27a57d00 Rename variable for consistency (matrix_static_files_ident -> matrix_static_files_identifier) 2024-01-09 09:54:00 +02:00
Slavi Pantaleev
ea992496a3 Add matrix-cactus-comments-client role
This is split out from matrix-cactus-comments (see 241779b583),
but also heavily inspired by `matrix-static-files`.
2024-01-09 09:53:01 +02:00
Slavi Pantaleev
241779b583 Initial work on moving matrix-cactus-comments to its own container network and splitting cactus-client out of it 2024-01-08 19:57:18 +02:00
Slavi Pantaleev
1750f11abc Merge branch 'master' into bye-bye-nginx-proxy 2024-01-08 19:31:20 +02:00
Slavi Pantaleev
4011eaf258 Rename variables having an incorrect prefix (matrix_bot_cactus_ -> matrix_cactus_)
Looks like these variables were originally named this way in
https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2089
2024-01-08 19:30:24 +02:00
Slavi Pantaleev
30d82cc651 Merge branch 'master' into bye-bye-nginx-proxy 2024-01-08 18:18:34 +02:00
Slavi Pantaleev
b6916d3adc Add public_address to mautrix-discord
Related to https://github.com/mautrix/discord/issues/95
2024-01-08 18:16:02 +02:00
Slavi Pantaleev
594e6d9679 Move matrix-sms-bridge to its own container network and add support for non-Synapse homeservers 2024-01-08 18:10:38 +02:00
Slavi Pantaleev
8e8c9cc03b Move matrix-bridge-mx-puppet-twitter to its own container network and add native Traefik support 2024-01-08 17:56:37 +02:00
Slavi Pantaleev
1e19fee772 Move matrix-bridge-mx-puppet-steam to its own container network 2024-01-08 17:56:12 +02:00
Slavi Pantaleev
3c099541a7 Move matrix-bridge-mx-puppet-slack to its own container network and add native Traefik support 2024-01-08 17:56:12 +02:00
Slavi Pantaleev
150a40ec26 Move matrix-bridge-mx-puppet-instagram to its own container network 2024-01-08 17:16:50 +02:00
Slavi Pantaleev
f94f2b9823 Move matrix-bridge-mx-puppet-groupme to its own container network 2024-01-08 17:16:50 +02:00
Slavi Pantaleev
82de4581e3 Add support for disabling presence on matrix-bridge-mx-puppet-discord 2024-01-08 17:06:38 +02:00
Slavi Pantaleev
6d0ecb0269 Move matrix-bridge-mx-puppet-discord to its own container network 2024-01-08 17:03:48 +02:00
Slavi Pantaleev
5764c2cc67 Merge branch 'master' into bye-bye-nginx-proxy 2024-01-08 13:29:10 +02:00
Slavi Pantaleev
e48adcb91d Upgrade sliding-sync (v0.99.13 -> v0.99.14) 2024-01-08 13:29:01 +02:00
Slavi Pantaleev
effca48288 Remove matrix-nginx-proxy integration for matrix-bridge-mautrix-wsproxy
This probably never even worked anyway and was a leftover copy/paste
from some other role.

The docs (`docs/configuring-playbook-bridge-mautrix-wsproxy.md`) only
talk about `matrix_mautrix_wsproxy_hostname`, which was only used via
Traefik labels. The endpoint exposed via `matrix-nginx-proxy` (`/_matrix/wsproxy`)
hasn't been mentioned anywhere.
2024-01-08 09:19:24 +02:00
Slavi Pantaleev
8b28f8e122 Move matrix-bridge-mautrix-twitter to its own container network and add native Traefik support 2024-01-07 17:54:46 +02:00
Slavi Pantaleev
f9b4ae8241 Move matrix-bridge-mautrix-telegram to its own container network and add native Traefik support 2024-01-07 17:35:10 +02:00
Slavi Pantaleev
0f89156e94 Move matrix-bridge-mautrix-slack to its own container network 2024-01-07 17:22:43 +02:00
Slavi Pantaleev
d6911503a0 Move matrix-bridge-mautrix-signal to its own container network and add native Traefik support 2024-01-07 17:16:38 +02:00
Slavi Pantaleev
7ec6fd3dfe Make bridges/bots use matrix_addons_homeserver_client_api_url (instead of matrix_homeserver_container_url) 2024-01-07 17:04:23 +02:00
Slavi Pantaleev
142de83b41 Move matrix-bridge-mautrix-hangouts to its own container network 2024-01-07 15:37:39 +02:00
Slavi Pantaleev
6723fcd6d5 Add labels to matrix-mautrix-googlechat.service and use --mount instead of -v 2024-01-07 15:31:39 +02:00
Slavi Pantaleev
f8f3318bb2 Move matrix-bridge-mautrix-googlechat to its own container network 2024-01-07 15:24:11 +02:00
Slavi Pantaleev
c6c88c2503 Move matrix-bridge-mautrix-gmessages to its own container network 2024-01-07 15:24:11 +02:00
Slavi Pantaleev
5e7b882ce9 Adjust homeserver URL for Buscarron 2024-01-07 15:24:11 +02:00
Slavi Pantaleev
39e45b0298 Move matrix-bridge-heisenbridge to its own container network 2024-01-07 15:24:10 +02:00
Slavi Pantaleev
493a9abafa Move matrix-bridge-go-skype-bridge to its own container network 2024-01-07 14:48:21 +02:00
Slavi Pantaleev
205663a4be Move matrix-bridge-beeper-linkedin to its own container network 2024-01-07 13:56:40 +02:00
Slavi Pantaleev
b651495c07 Fixups for maubot and appservice-slack container labels 2024-01-07 12:48:48 +02:00
Slavi Pantaleev
a5618a893b Move matrix-bridge-appservice-webhooks to its own container network 2024-01-07 12:48:30 +02:00
Slavi Pantaleev
db53a17a38 Move matrix-bridge-appservice-slack to its own container network 2024-01-07 12:22:51 +02:00
Slavi Pantaleev
3fe3d5a78c Move matrix-bridge-appservice-kakaotalk to its own container network 2024-01-07 12:04:27 +02:00
Slavi Pantaleev
dcdc43b6aa Move matrix-bridge-appservice-irc to its own container network 2024-01-07 12:00:46 +02:00
Slavi Pantaleev
bf11a3c2ca Tie up some loose ends for matrix-appservice-discord 2024-01-07 11:56:05 +02:00
Slavi Pantaleev
7d625011a1 Move matrix-bridge-appservice-discord to its own container network 2024-01-07 10:23:01 +02:00
Slavi Pantaleev
c5006c3ac2 Move matrix-bot-maubot to its own container network and add native Traefik support 2024-01-07 10:16:42 +02:00
Slavi Pantaleev
6deb99f31b Add missing network-creation tasks for some bot roles 2024-01-07 09:46:09 +02:00
Slavi Pantaleev
d5ea80cf68 Remove unused variable (matrix_bot_matrix_registration_environment_variables_extension) 2024-01-07 09:34:11 +02:00
Slavi Pantaleev
87c8c29c47 Move matrix-bot-matrix-registration-bot to its own container network 2024-01-07 09:33:37 +02:00
Slavi Pantaleev
628496d022 Move matrix-bot-honoroit to its own container network 2024-01-07 09:30:08 +02:00
Slavi Pantaleev
835f623bb8 Move matrix-bot-go-neb to its own container network 2024-01-07 09:23:24 +02:00
Slavi Pantaleev
867af6385a Move matrix-bot-mjolnir to its own container network 2024-01-07 09:20:24 +02:00
Slavi Pantaleev
88ad58fccb Move matrix-bot-draupnir to its own container network 2024-01-07 09:04:38 +02:00
Slavi Pantaleev
d8b867b6fb Move matrix-bot-buscarron to its own container network 2024-01-07 09:04:35 +02:00
Slavi Pantaleev
b122c7092a Merge branch 'master' into bye-bye-nginx-proxy 2024-01-05 18:12:44 +02:00
Slavi Pantaleev
d116d863e6 Move exim-relay service to its own network and connect Synapse & ma1sd to it automatically 2024-01-05 18:10:24 +02:00
Slavi Pantaleev
377fce5855 Merge branch 'master' into bye-bye-nginx-proxy 2024-01-05 17:55:49 +02:00
Slavi Pantaleev
ba0a4e864a Replace matrix-mailer with an external role 2024-01-05 17:54:50 +02:00
Slavi Pantaleev
1f6bb281e9 Fix typo in old devture-traefik migration task 2024-01-05 17:09:19 +02:00
Slavi Pantaleev
9488e3857a Put all homeservers in the matrix-homeserver container network 2024-01-05 16:49:48 +02:00
Slavi Pantaleev
7766db2a5f
Merge pull request #3083 from Braindot-fr/3082-mautrix-signal-config
[#3082] Analog Signal spaces configuration with rest of playbook
2024-01-05 16:01:08 +02:00
Slavi Pantaleev
e7b7b48db5 Merge branch 'master' into bye-bye-nginx-proxy 2024-01-05 11:07:50 +02:00
Pierre 'McFly' Marty
a266da1b78
fix: space sync config 2024-01-05 10:49:09 +02:00
Slavi Pantaleev
724021cfde
Merge pull request #3076 from cvwright/cvwright/worker-keepalive
Add keepalive on worker upstreams and use persistent connections
2024-01-05 10:48:32 +02:00
Slavi Pantaleev
9b6c393414 Merge branch 'master' into bye-bye-nginx-proxy 2024-01-05 10:20:33 +02:00
Slavi Pantaleev
fc151fed77 Add raw/endraw around problematic texts in matrix-bridge-mautrix-signal/templates/config.yaml
Fixes: https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/3082

Related to: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/3079
2024-01-05 10:20:00 +02:00
Slavi Pantaleev
b37a02720f Move all Matrix client apps into the matrix-addons container network
Putting each client into its own network was good for isolation,
but it's quite wasteful in terms of the container network pool.
2024-01-05 07:17:11 +02:00
Slavi Pantaleev
2ec6448cdb Merge branch 'master' into bye-bye-nginx-proxy 2024-01-05 07:05:34 +02:00
Slavi Pantaleev
06f561f0dd Build latest/main branch of rust-synapse-compress-state for non-amd64 users
The latest tagged release (v0.1.3) does not pin any versions in its
Dockerfile and as such fails to build right now.

The `main` branch of rust-synapse-compress-state has already addressed
this and is buildable, but there's no tagged release yet.

Reported here: https://github.com/matrix-org/rust-synapse-compress-state/issues/134
2024-01-05 07:05:28 +02:00
Slavi Pantaleev
d262ca0fe6 Only enable matrix-synapse-reverse-proxy-companion when Synapse workers are enabled
This allows us to eliminate the companion and decrease overhead for
simple servers which do not use workers.
2024-01-05 07:00:50 +02:00
Slavi Pantaleev
14278c51c2
Merge pull request #3079 from IUCCA/master
update mautrix-signal
2024-01-05 06:36:45 +02:00
Slavi Pantaleev
499e4887f7 Connect sliding-sync directly to the homeserver
This saves up 1 container network and avoids going through extra proxies
unnecessarily.
2024-01-05 06:28:42 +02:00
Slavi Pantaleev
3fb016cd6b Put bots and bridges in the same network and remove a few variables
Downsides: decreasing security slightly due to less networking isolation

Benefits:

- decreased complexity
- having a generically-named `matrix-addons` network we may use for other things now (client apps, etc.)
- not exhausting the container networks pool with 2 (or more) networks and using just 1
2024-01-05 06:13:12 +02:00
Slavi Pantaleev
170f321a01 Minor sliding-sync improvements 2024-01-05 06:04:44 +02:00
IUCCA
2b2c1880cb
Updated mautrix-signal docker image 2024-01-05 00:09:40 +01:00
renovate[bot]
04de14a462
chore(deps): update vectorim/element-web docker tag to v1.11.53 2024-01-04 17:00:48 +00:00
Slavi Pantaleev
015acb6d08 Add native Traefik support to matrix-synapse 2024-01-04 19:00:23 +02:00
Slavi Pantaleev
fe7c06d6f5 Fix duplicate labels in matrix-synapse-reverse-proxy-companion 2024-01-04 18:07:24 +02:00
IUCCA
0222e75c19 added new options to mautrix-signal config template 2024-01-04 16:06:58 +01:00
IUCCA
9c3d8687bf added new options to mautrix-signal config template 2024-01-04 15:09:42 +01:00
IUCCA
8f88b5d25e updated mautrix-signal docker image 2024-01-04 15:04:06 +01:00
Slavi Pantaleev
ab15991814 Fix some ansible-lint-reported errors 2024-01-04 13:00:46 +02:00
Slavi Pantaleev
abde681b56 Clean up some matrix_nginx_proxy_proxy_matrix_metrics_* references 2024-01-04 12:49:00 +02:00
Slavi Pantaleev
54fb153acf Expose /_synapse/* APIs via matrix-synapse-reverse-proxy-companion
This also updates validation tasks and documentation, pointing to
variables in the matrix-synapse role which don't currently exist yet
(e.g. `matrix_synapse_container_labels_client_synapse_admin_api_enabled`).

These variables will be added soon, as Traefik labels are added to the
`matrix-synapse` role. At that point, the `matrix-synapse-reverse-proxy-companion` role
will be updated to also use them.
2024-01-04 11:37:17 +02:00
Slavi Pantaleev
0ea3fa0e85 Add matrix_synapse_reverse_proxy_companion_container_labels_traefik_hostname to simplify wiring 2024-01-04 10:53:43 +02:00
Slavi Pantaleev
84cedff355 Adjust validation message 2024-01-04 10:38:07 +02:00
Slavi Pantaleev
4752e7f9a0 Get rid of matrix_nginx_proxy_proxy_matrix_client_redirect_root_uri_to_domain 2024-01-04 10:27:32 +02:00
Slavi Pantaleev
e678adfeda Add root path (/) handling to matrix-synapse-reverse-proxy-companion (redirect or /_matrix/static/ serving) 2024-01-04 10:24:33 +02:00
Charles Wright
c053336ad2 Add keepalive on worker upstreams and use HTTP 1.1 for persistent connections 2024-01-03 14:43:01 -06:00
Slavi Pantaleev
354c887602 Fix incorrect variable name 2024-01-03 17:11:39 +02:00
Slavi Pantaleev
bbd9493b8f Handle /_matrix Client-Server and Federation APIs directly at matrix-synapse-reverse-proxy-companion 2024-01-03 17:05:59 +02:00
Slavi Pantaleev
97f40a95fb Make compress middleware for /.well-known/matrix/* configurable 2024-01-03 16:18:39 +02:00
Slavi Pantaleev
e81a395a98 Drop some matrix_nginx_proxy_proxy_riot_compat_* variables
matrix-nginx-proxy is going away and this is one of the features it
offered.

This feature will have no equivalent in our new Traefik-only
setup, although it's possible to implement it manually by using
`matrix_client_element_container_labels_additional_labels`
2024-01-03 14:43:45 +02:00
Slavi Pantaleev
cc75be9c65 Add support for serving the base domain via matrix-static-files 2024-01-03 14:39:17 +02:00
Slavi Pantaleev
da48a605bb More progress on matrix-static-files role and cleaning up of matrix-base and matrix-nginx-proxy 2024-01-03 13:46:25 +02:00
Slavi Pantaleev
015b8f69de Rework comment for matrix_static_files_file_matrix_support_enabled 2024-01-03 13:10:45 +02:00
Slavi Pantaleev
46cbc2ead0 Merge branch 'master' into bye-bye-nginx-proxy 2024-01-03 13:09:55 +02:00
Slavi Pantaleev
61bf368080 Mark /.well-known/matrix/support as accepted spec 2024-01-03 13:09:45 +02:00
Slavi Pantaleev
065b70203d [WIP] Initial work on matrix-static-files role 2024-01-03 13:05:59 +02:00
Slavi Pantaleev
128a7b82d5 Switch mautrix-instagram from matrix-nginx-proxy to matrix-homeserver-proxy
This is completely untested.
2024-01-03 09:25:05 +02:00
Slavi Pantaleev
16653bdbb4
Merge pull request #3073 from spantaleev/renovate/halfshot-matrix-hookshot-5.x
chore(deps): update halfshot/matrix-hookshot docker tag to v5.1.2
2024-01-02 21:51:44 +02:00
Pierre 'McFly' Marty
c76aaf2e0b
fix(signal): tag follows declared version 2024-01-02 21:44:36 +02:00
renovate[bot]
b2b6edc8a1
chore(deps): update halfshot/matrix-hookshot docker tag to v5.1.2 2024-01-02 19:23:48 +00:00
Slavi Pantaleev
feaf1ee7e7 Switch mautrix-whatsapp from matrix-nginx-proxy to matrix-homeserver-proxy 2024-01-02 17:41:36 +02:00
Slavi Pantaleev
8eb07e8d85 Minor mautrix-facebook fixes 2024-01-02 17:36:39 +02:00
Slavi Pantaleev
20c7cabfe4 Switch mautrix-discord from matrix-nginx-proxy to matrix-homeserver-proxy 2024-01-02 17:22:23 +02:00
Slavi Pantaleev
77b0ef4799 Add Traefik support to Hookshot 2024-01-02 17:10:26 +02:00
Slavi Pantaleev
4a6287c528 Initial work on matrix-homeserver-proxy role and eliminating matrix-nginx-proxy
This is still very far from usable.

Various bridges and bots are still talking to
`matrix-nginx-proxy` instead of the new `matrix-homeserver-proxy` role.
These services need to be reworked. While reworking them,
various cleanups are being done as well as adding Traefik-labels to
those that need them.
2024-01-02 16:07:40 +02:00
Slavi Pantaleev
aa60fdeb00 Do not put architecture stuff in matrix_mautrix_signal_version
.. because matrix_mautrix_signal_version is used in other places
which do not expect it. For example: `matrix_mautrix_signal_container_image_self_build_branch`

Related to: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/3041
2024-01-02 16:01:16 +02:00
Pierre 'McFly' Marty
4db1e5930d
chore: update signal bridge 2023-12-31 12:36:33 +01:00
Pierre 'McFly' Marty
6d4d1bf679
Merge branch 'spantaleev:master' into 3031-feat-add-signalgo-bridge 2023-12-30 16:51:03 +01:00
Pierre 'McFly' Marty
e5d31b5883
chore: update signal bridge version 2023-12-30 16:46:55 +01:00
Pierre 'McFly' Marty
cd9411158f
fix: signal docker tag follow system arch 2023-12-30 16:39:49 +01:00
renovate[bot]
bfd7fa4b95
chore(deps): update halfshot/matrix-hookshot docker tag to v5.1.1 2023-12-29 18:04:46 +00:00
renovate[bot]
9c7d0fb2ad
chore(deps): update halfshot/matrix-hookshot docker tag to v5.1.0 2023-12-29 15:06:26 +00:00
Pierre 'McFly' Marty
c873516cb6
Merge branch 'spantaleev:master' into 3031-feat-add-signalgo-bridge 2023-12-29 14:51:33 +01:00
renovate[bot]
b2aa81a5ea
chore(deps): update halfshot/matrix-hookshot docker tag to v5 2023-12-28 01:27:08 +00:00
Pierre 'McFly' Marty
91e39a58f7
feat: relay mode in signal 2023-12-27 12:20:34 +01:00
Pierre 'McFly' Marty
db46933b3a
Merge branch 'spantaleev:master' into 3031-feat-add-signalgo-bridge 2023-12-27 10:45:52 +01:00
renovate[bot]
0ded422cf9
chore(deps): update dock.mau.dev/mautrix/telegram docker tag to v0.15.1 2023-12-26 18:33:59 +00:00
Pierre 'McFly' Marty
811c6b1af5
Merge branch 'spantaleev:master' into 3031-feat-add-signalgo-bridge 2023-12-26 09:39:46 +01:00
Slavi Pantaleev
11ee949e9e Add native Traefik support to matrix-corporal (HTTP API) 2023-12-23 10:36:20 +02:00
Slavi Pantaleev
e47ad60cf5 Add support for additional networks to matrix-corporal 2023-12-23 09:33:56 +02:00
Pierre 'McFly' Marty
055406b255
Merge branch 'spantaleev:master' into 3031-feat-add-signalgo-bridge 2023-12-22 16:48:06 +01:00
Slavi Pantaleev
3da4c66b85
Merge pull request #3045 from Michael-Hollister/michael/mmr-federation-fix
MMR reverse proxy updates
2023-12-22 08:48:55 +02:00
Slavi Pantaleev
ce013a325c Remove duplicate matrix_media_repo_identifier definition from group_vars/matrix_servers
`matrix_media_repo_identifier` is already defined in the role defaults,
which is a better role to have it anyway.
2023-12-22 08:43:30 +02:00
Pierre 'McFly' Marty
1894f84b8a
chore: update bridge docker tag 2023-12-21 18:27:32 +01:00
Pierre 'McFly' Marty
a8e14ac79e
fix: ansible yaml syntax 2023-12-21 14:03:37 +01:00
Michael Hollister
0908c6b662 Added Traefik support to MMR 2023-12-20 13:38:46 -06:00
Pierre 'McFly' Marty
7163b9df3c
Merge branch 'spantaleev:master' into 3031-feat-add-signalgo-bridge 2023-12-20 17:52:51 +01:00
renovate[bot]
8ca3b7c5c6
chore(deps): update vectorim/element-web docker tag to v1.11.52 2023-12-19 16:56:18 +00:00
Pierre 'McFly' Marty
81e015db9d
feat: auto removal of signal-daemon service 2023-12-19 12:37:13 +01:00
Pierre 'McFly' Marty
b426a68316
chore: update mautrix-signal for legacy compat. 2023-12-19 12:33:05 +01:00
Pierre 'McFly' Marty
c93b642f90
doc: check typo 2023-12-18 16:51:35 +01:00
Pierre 'McFly' Marty
c9a1d79954
Merge branch 'spantaleev:master' into 3031-feat-add-signalgo-bridge 2023-12-18 16:39:34 +01:00
Pierre 'McFly' Marty
2f6525ccb3
refactor: remove signalgo and update signal to 'after merge' 2023-12-18 16:38:52 +01:00
Michael Hollister
42f33339c5
Updated MMR docs with updated fields in main.yaml (#3047)
* Updated MMR docs with updated fields in main.yaml

* Removed uneeded placeholder db password
2023-12-18 11:01:59 +02:00
Slavi Pantaleev
64db27c7fa
Merge pull request #3049 from Michael-Hollister/michael/synapse-add-cp-config-variables
Added Synapse connection pool config variables
2023-12-17 09:18:21 +02:00
Slavi Pantaleev
fd3d9640d8
Merge pull request #3048 from spantaleev/renovate/dock.mau.dev-mautrix-whatsapp-0.x
chore(deps): update dock.mau.dev/mautrix/whatsapp docker tag to v0.10.5
2023-12-17 09:17:54 +02:00
Michael Hollister
a66a2d2692 Added Synapse connection pool config variables 2023-12-16 19:16:05 -06:00
renovate[bot]
d925409567
chore(deps): update dock.mau.dev/mautrix/whatsapp docker tag to v0.10.5 2023-12-17 00:21:33 +00:00
Michael Hollister
805280355c Changed mxc links to matrix_domain instead of matrix_server_fqn_matrix 2023-12-16 16:52:04 -06:00
renovate[bot]
90d576dac9
chore(deps): update dock.mau.dev/mautrix/gmessages docker tag to v0.2.3 2023-12-16 22:39:09 +00:00
Michael Hollister
ae759bd86e Added missing MMR federation directives 2023-12-16 14:27:41 -06:00
Pierre 'McFly' Marty
0e4c878ee3
Merge branch 'spantaleev:master' into 3031-feat-add-signalgo-bridge 2023-12-16 12:34:56 +01:00
Slavi Pantaleev
9f5d4018c7 Upgrade matrix-mailer (4.96.2-r0-0 -> 4.97-r0-0) 2023-12-16 12:39:22 +02:00
Slavi Pantaleev
ae983491e7 Add undefined matrix_hookshot_container_ident variable (and rename it to matrix_hookshot_ident)
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/3042
2023-12-16 09:54:04 +02:00
Slavi Pantaleev
94c1503a60 Add support for experimental encryption in Hookshot
Squashed based on the work done in https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/3042

commit 49932b8f3c
Author: Slavi Pantaleev <slavi@devture.com>
Date:   Sat Dec 16 09:21:31 2023 +0200

    Fix syntax in matrix-bridge-hookshot/tasks/reset_encryption.yml

    Also, this task always does work and side-effects, so it should always report changes
    (`changed_when: true`).

commit 6bdf7a9dcb
Author: Slavi Pantaleev <slavi@devture.com>
Date:   Sat Dec 16 09:12:41 2023 +0200

    Add Hookshot validation task to ensure queue settings are set when encryption is enabled

commit 8c531b7971
Author: Slavi Pantaleev <slavi@devture.com>
Date:   Sat Dec 16 09:10:17 2023 +0200

    Add missing variables rewiring in group_vars/matrix_servers for Hookshot

commit 7d26dabc2f
Author: Slavi Pantaleev <slavi@devture.com>
Date:   Sat Dec 16 09:08:19 2023 +0200

    Add defaults for matrix_hookshot_queue_host and matrix_hookshot_queue_port

commit 74f91138c9
Author: Slavi Pantaleev <slavi@devture.com>
Date:   Sat Dec 16 09:06:17 2023 +0200

    Fix syntax for connecting to additional networks for Hookshot

commit ca7b41f3f2
Author: Slavi Pantaleev <slavi@devture.com>
Date:   Sat Dec 16 09:05:28 2023 +0200

    Fix indentation and remove unnecessary if-statements

commit ac4a918d58
Author: Slavi Pantaleev <slavi@devture.com>
Date:   Sat Dec 16 09:04:44 2023 +0200

    Add missing --network for Hookshot

    This seems to have been removed by accident.

commit 6a81fa208f
Author: Slavi Pantaleev <slavi@devture.com>
Date:   Sat Dec 16 09:02:47 2023 +0200

    Make automatic Redis enabling safer, when Hookshot encryption enabled

    If we ever default encryption to enabled for Hookshot, we only wish to force-enable Redis if Hookshot is actually enabled.

commit 75a8e0f2a6
Author: Slavi Pantaleev <slavi@devture.com>
Date:   Sat Dec 16 09:01:10 2023 +0200

    Fix typo

commit 98ad182eac
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Fri Dec 15 22:37:40 2023 +0100

    Add defaults for Hookshot's encryption

commit 29fa9fab15
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Fri Dec 15 22:35:11 2023 +0100

    Improve wording of Hookshot's encryption section

commit 4f835e0560
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Fri Dec 15 22:28:52 2023 +0100

    use safer mount options for the container's files

commit 8c93327e25
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Fri Dec 15 22:26:01 2023 +0100

    fix filename

commit 03a7bb6e77
Merge: e55d7694 06047763
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Fri Dec 15 22:23:44 2023 +0100

    Merge branch 'HarHarLinks/hookshot-encryption' of https://github.com/real-joshua/matrix-docker-ansible-deploy into HarHarLinks/hookshot-encryption

commit 06047763bb
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Fri Dec 15 22:15:54 2023 +0100

    Update roles/custom/matrix-bridge-hookshot/templates/config.yml.j2

    change the if statement to not require a variable with a length > 0 and add a filter to json for the redis host

    Co-authored-by: Slavi Pantaleev <slavi@devture.com>

commit e55d769465
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Fri Dec 15 22:13:50 2023 +0100

    clarify that Redis is required, standardadise on Hookshot with an upper-case first letter for consistency

commit 66706e4535
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Fri Dec 15 22:08:20 2023 +0100

    Update roles/custom/matrix-bridge-hookshot/templates/config.yml.j2

    fix for a typo

    Co-authored-by: Slavi Pantaleev <slavi@devture.com>

commit f6aaeb9a16
Merge: e5d34002 869dd33f
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Fri Dec 15 00:22:34 2023 +0100

    Merge branch 'master' into HarHarLinks/hookshot-encryption

commit e5d34002fd
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Fri Dec 15 00:09:27 2023 +0100

    Add Jinja loop to allow adding multiple networks

commit 69f947782d
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Thu Dec 14 23:52:41 2023 +0100

    split if statements for the message queue and experimental encryption support into seperate statements

commit 4c13be1c89
Author: Joshua Hoffmann <joshua.hoffmann@b1-systems.de>
Date:   Thu Dec 14 23:31:19 2023 +0100

    change variable name per spantaleev's suggestion (https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2979#discussion_r1379015551)

commit 9905309aa9
Author: HarHarLinks <kim.brose@rwth-aachen.de>
Date:   Wed Nov 1 16:14:04 2023 +0100

    amend docs

commit 94abf2d5bd
Author: HarHarLinks <kim.brose@rwth-aachen.de>
Date:   Wed Nov 1 16:05:22 2023 +0100

    draft encryption support for hookshot
2023-12-16 09:23:35 +02:00
Pierre 'McFly' Marty
c028d75f9e
fix: sqlite backend is sqlite3-fk-wal 2023-12-15 23:08:25 +01:00
Pierre 'McFly' Marty
c49cf35ba6
Merge branch 'spantaleev:master' into 3031-feat-add-signalgo-bridge 2023-12-15 22:28:03 +01:00
Pierre 'McFly' Marty
3dc4923e6e
fix: signalgo puppet-ed user regex
Co-authored-by: lon <114724657+longregen@users.noreply.github.com>
2023-12-15 22:23:37 +01:00
Slavi Pantaleev
cfea80b52a Upgrade matrix-corporal (2.6.0 -> 2.7.0) 2023-12-15 22:20:09 +02:00
Pierre 'McFly' Marty
e3fdd6b955
Merge branch 'spantaleev:master' into 3031-feat-add-signalgo-bridge 2023-12-15 20:36:31 +01:00
Pierre 'McFly' Marty
6bd581ef7f
refactor: update links to avoid future issue 2023-12-15 11:18:18 +01:00
Pierre 'McFly' Marty
4a8d8d8ce5
fix: hydrogen client docker/sources url 2023-12-15 11:08:23 +01:00
Pierre 'McFly' Marty
173286470c
fix: signalgo starts properly 2023-12-14 22:30:25 +01:00
Pierre 'McFly' Marty
a42aacb41c
fix: remove unsued signalgo-daemon.service 2023-12-14 21:44:14 +01:00
Pierre 'McFly' Marty
7a83c2026c
fix: escape jinja '.' 2023-12-14 19:57:12 +01:00
Pierre 'McFly' Marty
0f7b89523f
feat: enroll signalgo to nginx proxy 2023-12-14 18:23:55 +01:00
Pierre 'McFly' Marty
69a7847097
feat: add files for signalgo installation 2023-12-14 16:01:44 +01:00
Slavi Pantaleev
abd0823554
Add some parenthesis in if statement 2023-12-14 09:09:10 +02:00
axiopaladin
da039614fd
updated MMR yaml defaults and docs for basic dendrite support 2023-12-13 22:36:43 -05:00
Slavi Pantaleev
6ecb973e61
Merge pull request #3035 from slikie/slikie-patch-1
Update synapse 1.97.0 -> 1.98.0
2023-12-12 22:26:35 +02:00
renovate[bot]
fe6a586428
chore(deps): update matrixdotorg/dendrite-monolith docker tag to v0.13.5 2023-12-12 19:43:12 +00:00
slikie
dee3de0bcb
bump synapse version 2023-12-13 02:25:06 +08:00
renovate[bot]
308b816d0c
Update halfshot/matrix-hookshot Docker tag to v4.7.0 2023-12-06 14:28:23 +00:00
Slavi Pantaleev
c2605cd3cc Optimize matrix-heisenbridge container stopping time 2023-12-06 12:13:06 +02:00
Slavi Pantaleev
6b04afb49a Optimize matrix-bot-chatgpt container stopping time 2023-12-06 12:11:53 +02:00
Slavi Pantaleev
2511b34a7c Stop containers gracefully, instead of outright killing them 2023-12-06 11:52:23 +02:00
Slavi Pantaleev
66bb426f10
Merge pull request #3021 from Michael-Hollister/michael/update-media-repo-v1-3-3
Updated matrix media repo to v1.3.3
2023-12-06 08:40:17 +02:00
renovate[bot]
26f45976f5
chore(deps): update vectorim/element-web docker tag to v1.11.51 2023-12-06 06:32:33 +00:00
Michael Hollister
e55d3a7366 Added missing angle brackets 2023-12-05 23:38:34 -06:00
Michael Hollister
cedeedcc06 Added config validation for matrix media repo 2023-12-05 23:35:05 -06:00
Michael Hollister
85005d1b0b Fixed linting warnings 2023-12-04 13:26:13 -06:00
Michael Hollister
305e3afb1b Updated matrix media repo to v1.3.3 2023-12-04 12:37:39 -06:00
renovate[bot]
d318d8cf8a
chore(deps): update ghcr.io/matrix-org/sliding-sync docker tag to v0.99.13 2023-12-04 14:18:28 +00:00
Slavi Pantaleev
1e833d602c
Merge pull request #3016 from etkecc/mautrix-permissions
mautrix: allow relay access by default, closes #3014
2023-11-29 16:40:25 +02:00
Aine
95c2db3bb3
mautrix: allow relay access by default, closes #3014 2023-11-29 13:32:14 +02:00
Aine
5b6fc8d547
buscarron: migrate to native /metrics auth 2023-11-29 13:23:57 +02:00
Slavi Pantaleev
910166effd Upgrade Synapse (v1.96.1 -> v1.97.0) 2023-11-28 19:15:07 +02:00
renovate[bot]
22567043e4
chore(deps): update dock.mau.dev/mautrix/telegram docker tag to v0.15.0 2023-11-26 21:10:12 +00:00
renovate[bot]
3bcd0138d4
chore(deps): update linuxserver/ddclient docker tag to v3.11.2 2023-11-23 13:22:29 +00:00
renovate[bot]
ba0d86370a
Update matrixdotorg/sygnal Docker tag to v0.13.0 2023-11-21 16:55:17 +00:00
Slavi Pantaleev
36c94b9364 Fix potential Docker apt repository signed-by conflict on Debian-based systems
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2999
Related to https://github.com/geerlingguy/ansible-role-docker/pull/410
2023-11-21 15:41:00 +02:00
renovate[bot]
ce23a645b4
Update vectorim/element-web Docker tag to v1.11.50 2023-11-21 12:41:08 +00:00
renovate[bot]
d6db0ef729
Update halfshot/matrix-hookshot Docker tag to v4.6.0 2023-11-20 19:04:00 +00:00
Aine
743d580daa
Update synapse-s3-storage-provider
looks like newer version is required for synapse 1.96.1
2023-11-17 19:35:28 +02:00
Slavi Pantaleev
3e696594b4
Merge pull request #2994 from spantaleev/renovate/matrixdotorg-synapse-1.x
Update matrixdotorg/synapse Docker tag to v1.96.0
2023-11-17 16:12:01 +02:00
Slavi Pantaleev
3dc77c4f9a
Upgrade Synapse (v1.96.0 -> v1.96.1) 2023-11-17 16:11:55 +02:00
Slavi Pantaleev
918b2cb79e
Merge pull request #2995 from spantaleev/renovate/dock.mau.dev-mautrix-discord-0.x
Update dock.mau.dev/mautrix/discord Docker tag to v0.6.4
2023-11-17 07:53:17 +02:00
Slavi Pantaleev
5cc06383dd
Merge pull request #2996 from spantaleev/renovate/dock.mau.dev-mautrix-gmessages-0.x
Update dock.mau.dev/mautrix/gmessages Docker tag to v0.2.2
2023-11-17 07:52:52 +02:00
renovate[bot]
147798a69f
Update dock.mau.dev/mautrix/whatsapp Docker tag to v0.10.4 2023-11-17 04:52:47 +00:00
renovate[bot]
1ca21c6a4f
Update dock.mau.dev/mautrix/gmessages Docker tag to v0.2.2 2023-11-17 01:23:32 +00:00
renovate[bot]
87bc059065
Update dock.mau.dev/mautrix/discord Docker tag to v0.6.4 2023-11-17 01:23:28 +00:00
renovate[bot]
35c20d7531
Update matrixdotorg/synapse Docker tag to v1.96.0 2023-11-16 20:12:41 +00:00
renovate[bot]
be70430290
Update matrixdotorg/mjolnir Docker tag to v1.6.5 2023-11-15 00:24:51 +00:00
Slavi Pantaleev
706df484cc Upgrade Element (v1.11.48 -> v1.11.49) 2023-11-13 12:53:09 +02:00
renovate[bot]
e6be3709f0
Update ghcr.io/matrix-org/sliding-sync Docker tag to v0.99.12 2023-11-09 19:00:31 +00:00
T. Küchel
81ee0749c8
Update matrix-domain.conf.j2 - trying to fix issue #2954 (#2985)
* Update matrix-domain.conf.j2

exchanged "^~" with "~" as a pattern matching in the location part.
I am very sure, that it only works using "~". I am not quite sure though, if this is the right way to do it, because "~" is probably more expensive than "^~"

the rewrite has to be behind the definition of the $backend. Otherwise nginx will fail to work. This is probably because "break" goes directly to the proxy_pass which uses $backend.

* Update matrix-domain.conf.j2

also change the order of "set $backend" and "rewrite" here in the 3pid registration section

* Update matrix-domain.conf.j2 - repeat v3_to_r0 rewrite in else-statement

as you said: repeat it for the else-case, where the ma1sd might be running on sans_container.

* Update matrix-domain.conf.j2 - corrected wrong variable

atrix_nginx_proxy_proxy_matrix_3pid_registration_v3_to_r0_redirect_enabled
is the right variable to check (twice) in the corresponding branch.

* matrix-domain.conf.j2 - fix-2954: change all whitespaces to tabs as you do it

---------

Co-authored-by: Tobias Küchel <t.kuechel@humboldt-ka.de>
2023-11-09 09:00:25 +02:00