Commit Graph

6980 Commits

Author SHA1 Message Date
jakicoll
be634168ac Make the linter happy. 2023-02-06 16:29:25 +01:00
jakicoll
f3ca4a0632 Remove unnecessary comment. 2023-02-06 16:28:57 +01:00
jakicoll
7848d865a5 Also define the vars to be overwritten in group vars within the role vars. 2023-02-06 16:28:56 +01:00
Paul N
70bea81df7 Introduced flags to (1) enable/disable Auth (2) enable/disable openid_server_name pinning. Updated validate_config.yml and added new checks to verify. 2023-02-06 15:59:32 +01:00
Paul N
96dd86d33b Set default values where sensible and remove unnecessary conditionals in .env.j2.
Check for empty string instead of Null to verify if an openid_server_name is pinned.
2023-02-06 15:26:08 +01:00
Paul N
d67d8c07f5 Remove remnant comment. 2023-02-06 15:26:08 +01:00
jakicoll
6b206b3763 Move checks into validate_config.yml. 2023-02-06 15:21:10 +01:00
jakicoll
6499b6536a Decoupling: Do not use variables user-verification-service role inside the jitsi role. 2023-02-06 15:18:25 +01:00
Paul N
1d99f17b4a Disable matrix-user-verification-service in group_vars and update docs accordingly. 2023-02-06 13:23:11 +01:00
Paul N
50c1e9d695 Set matrix_user_verification_service_uvs_homeserver_url in the role defaults and updated docs accordingly. 2023-02-06 13:14:34 +01:00
Paul N
07d9ea5e87 Stick to port 3003 instead of changing the port based on the status of grafana. 2023-02-06 13:06:35 +01:00
jakicoll
0e0ae2f3e6 Assign default log level in role instead of matrix_servers file. 2023-02-06 13:04:06 +01:00
jakicoll
bf5e633656 Remove the self-build stub, because self-build was not implemented 2023-02-06 12:57:20 +01:00
Paul N
b89f5b7ff5
Clarify task name and add user and group to templated env file
Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2023-02-06 12:47:50 +01:00
Jakob S
6913d368c8
Consolidate conditionals into a block, keep image
Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2023-02-06 12:38:01 +01:00
jakicoll
f53731756d Change comment
Applying the assumption, that synapse is always managed by this playbook.
2023-02-06 12:15:54 +01:00
Slavi Pantaleev
8155f780e5 Add support for reverse-proxying Matric (Client & Federation) via Traefik 2023-02-06 13:08:11 +02:00
jakicoll
94830b582b Wording: change collection -> playbook 2023-02-06 11:58:50 +01: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
946bbe9734 Upgrade prometheus_node_exporter (v1.5.0-1 -> v1.5.0-2) 2023-02-06 09:54:34 +02:00
Slavi Pantaleev
5de5b5c62c Upgrade prometheus_postgres_exporter (v0.11.1-1 -> v0.11.1-2) 2023-02-06 09:49:15 +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
045ed94d43 Upgrade prometheus_postgres_exporter (v0.11.1-0 -> v0.11.1-1) 2023-02-05 10:54:51 +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
Slavi Pantaleev
919f9701ce
Merge pull request #2443 from FSG-Cat/patch-2
Update Prometheus to v2.42.0 from v2.41.0
2023-02-02 17:32:06 +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
Slavi Pantaleev
4027531957
Merge pull request #2440 from etkecc/patch-161
Fix python packages path in synapse container
2023-02-01 08:28:29 +02: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
Slavi Pantaleev
c65d165c1b
Merge pull request #2437 from etkecc/patch-158
Update element 1.11.21 -> 1.11.22
2023-01-31 22:42:59 +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
Slavi Pantaleev
f5a85af47d
Merge pull request #2435 from etkecc/patch-156
Update element 1.11.20 -> 1.11.21
2023-01-31 18:02:38 +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
Slavi Pantaleev
dae1640070
Merge pull request #2433 from etkecc/patch-155
Update cinny 2.2.3 -> 2.2.4
2023-01-30 09:14:31 +02: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
d7c0239e40 Enable metrics endpoint for mautrix bridges by default when Prometheus is enabled
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2427

This just enables the endpoint, which is somewhat helpful, but not
really enough to scrape them. Ideally, we'd be injecting these targets
into the Prometheus scrape config too.
For now, registering targets with Prometheus is very manual
(`matrix_prometheus_scraper_postgres_enabled`, `matrix_prometheus_scraper_hookshot_enabled`, ..).
This should be redone - e.g. a new `matrix_prometheus_scrape_config_jobs_auto` variable,
which is dynamically built in `group_vars/matrix_servers`.
2023-01-30 08:53:28 +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