Commit Graph

299 Commits

Author SHA1 Message Date
Slavi Pantaleev
2b9061a5d3 Add support for reverse-proxying the base domain via Traefik 2023-02-07 11:02:02 +02:00
Slavi Pantaleev
8155f780e5 Add support for reverse-proxying Matric (Client & Federation) via Traefik 2023-02-06 13:08:11 +02:00
Slavi Pantaleev
f983604695 Initial work on Traefik support
This gets us started on adding a Traefik role and hooking Traefik:

- directly to services which support Traefik - we only have a few of
  these right now, but the list will grow

- to matrix-nginx-proxy for most services that integrate with
  matrix-nginx-proxy right now

Traefik usage should be disabled by default for now and nothing should
change for people just yet.

Enabling these experiments requires additional configuration like this:

```yaml
devture_traefik_ssl_email_address: '.....'

matrix_playbook_traefik_role_enabled: true
matrix_playbook_traefik_labels_enabled: true

matrix_ssl_retrieval_method: none

matrix_nginx_proxy_https_enabled: false

matrix_nginx_proxy_container_http_host_bind_port: ''
matrix_nginx_proxy_container_federation_host_bind_port: ''

matrix_nginx_proxy_trust_forwarded_proto: true

matrix_nginx_proxy_x_forwarded_for: '$proxy_add_x_forwarded_for'

matrix_coturn_enabled: false
```

What currently works is:
reverse-proxying for all nginx-proxy based services **except** for the Matrix homeserver
(both Client-Server an Federation traffic for the homeserver don't work yet)
2023-02-06 10:34:51 +02:00
Slavi Pantaleev
4d6a8d049d Add matrix_nginx_proxy_container_network variable 2023-02-06 08:48:11 +02:00
Slavi Pantaleev
e018663ba4 Attach ma1sd/nginx-proxy/synapse-reverse-proxy-companion to additional networks in a better way
Switching from doing "post-start" loop hacks to running the container
in 3 steps: `create` + potentially connect to additional networks + `start`.
This way, the container would be connected to all its networks even at
the very beginning of its life.
2023-02-06 08:38:43 +02:00
Slavi Pantaleev
be78b74fbd Switch from matrix-prometheus-postgres-exporter to an external prometheus_postgres_exporter role 2023-02-05 10:32:09 +02:00
Slavi Pantaleev
2d7d5d4bab Use new security-opt syntax (: -> =)
Related to https://docs.docker.com/engine/deprecated/#separator--of---security-opt-flag-on-docker-run
2023-02-03 20:36:24 +02:00
Catalan Lover
4d49f1f56e
Update Prometheus to v2.42.0 from v2.41.0
Docker images are released now so this change can now be pushed.
2023-02-02 16:00:07 +01:00
Aine
c11f772e78
Fix python packages path in synapse container 2023-01-31 21:34:25 +00:00
Slavi Pantaleev
7cb140b987
Downgrade Prometheus (v2.42.0 -> v2.41.0) until a container image gets published
Container image not published yet.

Reverts #2438
2023-01-31 23:24:20 +02:00
Slavi Pantaleev
d42ef7d243
Merge pull request #2439 from etkecc/patch-160
Update synapse 1.75.0 -> 1.76.0; default room version 9 -> 10
2023-01-31 22:44:04 +02:00
Slavi Pantaleev
c8ce83c725
Merge pull request #2438 from etkecc/patch-159
Update prometheus 2.41.0 -> 2.42.0
2023-01-31 22:43:34 +02:00
Aine
0f208ed053
Update synapse 1.75.0 -> 1.76.0; default room version 9 -> 10 2023-01-31 19:19:43 +00:00
Aine
82d870fddf
Update prometheus 2.41.0 -> 2.42.0 2023-01-31 19:16:52 +00:00
Aine
5300740f70
Update element 1.11.21 -> 1.11.22 2023-01-31 19:11:07 +00:00
Slavi Pantaleev
c7767e9bc8 Upgrade Coturn (4.6.1-r0 -> 4.6.1-r1) 2023-01-31 20:25:59 +02:00
Slavi Pantaleev
66bb2943b4
Merge pull request #2436 from etkecc/patch-157
Update jitsi stable-8218 -> stable-8252
2023-01-31 18:03:08 +02:00
Aine
68ca23d709
Update jitsi stable-8218 -> stable-8252 2023-01-31 14:02:50 +00:00
Aine
d70076c805
Update element 1.11.20 -> 1.11.21 2023-01-31 14:01:11 +00:00
Aine
8c2b77bf0c
Update cinny 2.2.3 -> 2.2.4 2023-01-30 07:07:09 +00:00
Slavi Pantaleev
611a74bde2 Use |to_json in mautrix metrics configuration
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2427
2023-01-30 08:59:35 +02:00
Slavi Pantaleev
d82d0ad84b Add _metrics_proxying_enabled variables to mautrix bridges
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2427

`metrics_enabled` should only expose the metrics locally, on the
container network, so that a local Prometheus can consume them.

Exposing them publicly should be done via a separate toggle (`metrics_proxying_enabled`).
This is how all other roles work, so this makes these mautrix roles consistent with the rest.
2023-01-30 08:50:57 +02:00
Slavi Pantaleev
cad83ddca6
Merge pull request #2427 from alemairebe/mautrix-metrics
Mautrix metrics
2023-01-30 08:36:40 +02:00
Slavi Pantaleev
f9a496c29c
Merge pull request #2432 from shalzz/patch/slack
mautrix-slack: add team name in channel name template
2023-01-30 08:27:48 +02:00
Shaleen Jain
df9931f719 mautrix-slack: add team name in channel name template 2023-01-30 10:17:19 +05:30
Slavi Pantaleev
389d6c978f
Merge pull request #2431 from etkecc/patch-154
Update borgmatic 1.7.5 -> 1.7.6
2023-01-29 21:51:42 +02:00
Slavi Pantaleev
5482a9d5d0
Merge pull request #2429 from etkecc/patch-152
Update mautrix-discord latest -> 0.1.0
2023-01-29 21:02:39 +02:00
Aine
4f69b22a6e
Update borgmatic 1.7.5 -> 1.7.6 2023-01-29 18:14:41 +00:00
Aine
a9a17d803e
Update maubot 0.3.1 -> 0.4.0 2023-01-29 18:12:26 +00:00
Aine
111303208a
Update mautrix-discord latest -> 0.1.0 2023-01-29 18:11:33 +00:00
Adrien le Maire
9eaf6944e3 add nginx proxy connfig for mautrix metrics 2023-01-29 15:17:31 +01:00
Adrien le Maire
691ef13cab template metric toggle for mautrix bridges supporting it 2023-01-29 09:45:52 +01:00
Slavi Pantaleev
e588c42088 Improve synapse-admin reverse-proxying fix
Fixup for 6a31fba346
2023-01-28 17:09:27 +02:00
Slavi Pantaleev
6a31fba346 Fix synapse-admin reverse-proxying regression caused by 0.8.6
Related to f165aa5d48

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2424
2023-01-28 17:04:55 +02:00
Aine
f165aa5d48
Update synapse-admin 0.8.5 -> 0.8.6 2023-01-28 07:54:52 +00:00
bertybuttface
7b5ced3037
Fix linting issue. 2023-01-27 19:02:14 +00:00
bertybuttface
d66a2949f6
Update env.j2
Use matrix_bot_chatgpt_context for CHATGPT_CONTEXT
2023-01-27 18:57:24 +00:00
bertybuttface
7e1408ea65
Bump ChatGPT version and add new config settings
matrix_bot_chatgpt_context=thread
2023-01-27 18:55:13 +00:00
Slavi Pantaleev
430a55902c
Merge pull request #2420 from bertybuttface/patch-1
Upgrade matrix-chatgpt-bot to latest
2023-01-27 08:57:16 +02:00
Slavi Pantaleev
784043cc5d
Ensure OPENAI_PRO is true/false (not True/False) 2023-01-27 08:55:38 +02:00
Slavi Pantaleev
867737fe0b Upgrade Grafana (9.3.4 -> 9.3.6) 2023-01-26 17:42:03 +02:00
Slavi Pantaleev
aafa8f019c Allow matrix_coturn_docker_network to be set to 'host' to use host-networking
This helps large deployments which need to open up thousands of ports
(matrix_coturn_turn_udp_min_port, matrix_coturn_turn_udp_min_port)

On a test VM, opening 1k ports takes 17 seconds for Docker to "publish"
all of these ports (setting up forwarding rules with the firewall, etc),
so service startup and shutdown take a long amount of time.

If host-networking is used, there's no need to open any ports at all
and startup/shutdown can be quick.
2023-01-26 17:35:30 +02:00
Slavi Pantaleev
bb0faa6bc3 Block various private network ranges via denied_peer_ips for Coturn by default
Inspired by: https://www.rtcsec.com/article/cve-2020-26262-bypass-of-coturns-access-control-protection/
2023-01-26 17:35:30 +02:00
Slavi Pantaleev
773cb7d37e Make no-tcp-relay Coturn configuration property configurable 2023-01-26 17:35:30 +02:00
Slavi Pantaleev
bf23d63f82 Add matrix_coturn_additional_configuration 2023-01-26 17:35:30 +02:00
Slavi Pantaleev
4c9f96722f Add no-multicast-peers to Coturn config by default
Part of a security hardening provoked by:
https://www.rtcsec.com/article/cve-2020-26262-bypass-of-coturns-access-control-protection/
2023-01-26 17:35:30 +02:00
bertybuttface
18c3903def
Update env.j2
Set OPEN_AI to matrix_bot_chatgpt_openai_pro
2023-01-26 15:12:36 +00:00
bertybuttface
ad58858a96
Upgrade matrix-chatgpt (1.2.3 -> 1.3.2)
Add support for OPENAI_PRO for ChatGPT pro subscriptions.
2023-01-26 15:09:24 +00:00
rhys
d01de9f33d Fix lint errors 2023-01-25 12:07:00 +00:00
rhys
547b01d618 Added option to allow user to set jigasi user and password for AUTH 2023-01-25 12:02:40 +00:00