Commit graph

4003 commits

Author SHA1 Message Date
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
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
Aine 6afd3c59eb
Update grafana 9.3.2 -> 9.3.4 2023-01-25 08:39:47 +00:00
Array in a Matrix 47165e8902
updated dendrite version 2023-01-24 15:50:06 -05:00
Slavi Pantaleev 54e5e4b6b9
Merge pull request #2416 from moan0s/fix_cactus_comments
Fix client js and css download (load compiled version)
2023-01-22 09:10:16 +02:00
Slavi Pantaleev c4d1347466
Fix typos 2023-01-22 09:08:47 +02:00
Julian-Samuel Gebühr 18d8d41e14 Fix client js and css download (load compiled version) 2023-01-21 20:54:12 +01:00
Slavi Pantaleev 9ed2e04d80 Switch from matrix-prometheus-node-exporter to an external prometheus_node_exporter role 2023-01-21 11:07:04 +02:00
Slavi Pantaleev 5f7ed722f6
Merge pull request #2415 from etkecc/patch-148
Update hookshot 2.6.1 -> 2.7.0
2023-01-20 22:40:54 +02:00
Aine 32292b1f02
Update hookshot 2.6.1 -> 2.7.0 2023-01-20 18:39:05 +00:00
Aine b71e267221
Update element 1.11.19 -> 1.11.20 2023-01-20 18:38:14 +00:00
Aine 8804a15821
Update element 1.11.18 -> 1.11.19 2023-01-19 05:10:49 +00:00
Vladimir Panteleev 6c332da7d3
Fix ChatGPT container
This container needs a writable $HOME, and will fail at startup if
there isn't one.

Provide one by pointing HOME to a path under the mounted /data
directory.
2023-01-19 01:21:44 +00:00
Aine 63a3764f51
Update element 1.11.17 -> 1.11.18 2023-01-18 15:45:04 +00:00
Slavi Pantaleev 70a35f17fe
Merge pull request #2402 from etkecc/patch-144
Update buscarron v1.3.0 -> v1.3.1
2023-01-18 16:33:00 +02:00
Aine 2fc02abfdc
Update buscarron v1.3.0 -> v1.3.1 2023-01-18 13:52:44 +00:00
Aine 903db54959
Update postmoogle 0.9.10 -> 0.9.11 2023-01-18 13:37:03 +00:00
Slavi Pantaleev 424f79df3a Replace synapse.app.pusher and synapse.app.federation_sender with synapse.app.generic_worker
Related to https://github.com/matrix-org/synapse/commit/3479599387164aca2613e88d169719
2023-01-17 15:55:57 +02:00
Slavi Pantaleev 34745b5206 Upgrade Synapse (v1.74.0 -> v1.75.0) 2023-01-17 15:53:26 +02:00
Slavi Pantaleev 3ff6e755a9 Upgrade Hookshot (2.6.0 -> 2.6.1) 2023-01-16 18:52:22 +02:00
Aine e053b2b0fc
update mautrix-whatsapp 0.8.0 -> 0.8.1 2023-01-16 13:17:02 +00:00
Aine 5c8bad6091
update borg image tag 2023-01-16 12:11:01 +02:00
Slavi Pantaleev 34c448c3bb Upgrade Cinny (2.2.2 -> 2.2.3) 2023-01-15 11:07:19 +02:00
Aine d1b4a6ebe1
unify docker images urls 2023-01-14 15:26:58 +02:00
Slavi Pantaleev 5d10001712
Merge pull request #2394 from etkecc/patch-141
Update hookshot 2.5.0 -> 2.6.0
2023-01-13 18:40:42 +02:00
Aine 627d8557ae
Update hookshot 2.5.0 -> 2.6.0 2023-01-13 16:31:19 +00:00
Aine e8c6267e9a
Update jitsi stable-8138-1 -> stable-8218 2023-01-13 16:30:18 +00:00
Slavi Pantaleev ae1ad3baf6 Improve block tasks indentation to make yamllint happy
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2392
2023-01-13 18:17:52 +02:00
Slavi Pantaleev 673ee508dc Upgrade matrix-chatgpt (1.2.2 -> 1.2.3) 2023-01-12 11:25:00 +02:00
Slavi Pantaleev ab8cb21a45 Upgrade matrix-chatgpt (1.2.1 -> 1.2.2) 2023-01-11 19:25:07 +02:00
Slavi Pantaleev 17438bd0dd Upgrade mjolnir (v1.6.3 -> v1.6.4) 2023-01-11 19:24:35 +02:00
Slavi Pantaleev 0c472c172e Upgrade mjolnir (v1.6.1 -> v1.6.3) 2023-01-11 13:51:35 +02:00
Slavi Pantaleev 4e40ac5ad8
Merge pull request #2227 from xangelix/add-matrix-mautrix-slack-role
Add matrix-bridge-mautrix-slack role
2023-01-11 10:35:45 +02:00
Slavi Pantaleev 226d81318a Merge branch 'bertybuttface-master' 2023-01-10 17:27:42 +02:00
Slavi Pantaleev a96a22c925 chatgpt docs updates 2023-01-10 17:26:59 +02:00
bertybuttface 0b88293393 Bump ChatGPT version. 2023-01-10 14:09:08 +00:00
bertybuttface 0ec1868b95 Add matrix-bot-chatgpt.
Co-Authored-By: Slavi Pantaleev <slavi@devture.com>
2023-01-10 13:57:38 +00:00
Slavi Pantaleev d2416365d2
Merge pull request #2220 from xangelix/synapse-s3-sse-c
Add S3 SSE-C config support for synapse-s3-storage-provider
2023-01-10 09:25:11 +02:00
Slavi Pantaleev f0d1e23c9d
Move around whitelines 2023-01-10 09:22:55 +02:00
Cody Wyatt Neiman fc9eaa6ec5
Remove git version for s3 storage provider 2023-01-09 15:52:38 -05:00
Aine 6bd909bbb7
add mode var for synapse ext ldap auth 2023-01-09 22:18:37 +02:00
Slavi Pantaleev 1d1fd7053c ewoutp/goofys:latest -> docker.io/ewoutp/goofys:latest 2023-01-09 18:55:22 +02:00
Aine b487bb6749
unify image prefixes 2023-01-08 22:05:43 +02:00
Aine 38151c9fd3
Update heisenbridge 1.14.0 -> 1.14.1 2023-01-06 11:03:18 +00:00
James Collier 36d8ea281c
Allow the mautrix whatsapp relaybot to be enabled with a variable (#2381)
* Allow the mautrix whatsapp relaybot to be enable with a variable

This allows a user to enable the relaybot by setting a variable in
`vars.yml` in the same way that the mautrix signal relaybot is
configured.

* Correct default values for mautrix whatsapp relaybot variables

* Add documentation for using the relaybot with mautrix whatsapp

* Adjust variable names to better reflect what they do

* Set default variables properly and use to_json in template
2023-01-06 11:09:07 +02:00
jakicoll 42e4e50f5b Matrix Authentication Support for Jitsi
This extends the collection with support for seamless authentication at the Jitsi server using Matrix OpenID.

1. New role for installing the [Matrix User Verification Service](https://github.com/matrix-org/matrix-user-verification-service)
2. Changes to Jitsi role: Installing Jitsi Prosody Mods and configuring Jitsi Auth
3. Changes to Jitsi and nginx-proxy roles: Serving .well-known/element/jitsi from jitsi.DOMAIN
4. We updated the Jitsi documentation on authentication and added documentation for the user verification service.
2023-01-04 14:27:16 +01:00
Cody Wyatt Neiman 7e5e1712f5
Encode s3 sse-c key for utf-8 2023-01-03 17:53:33 -05:00
Cody Wyatt Neiman f5390562ed
Fix synapse s3 storage provider container indentation 2023-01-03 16:13:09 -05:00
Cody Wyatt Neiman 6d96bcee1d
Allow 'git' as a version for s3 storage provider 2023-01-03 15:18:49 -05:00
Cody Wyatt Neiman 4d44f7b49e
Use base64 encoded string for sse-c key 2023-01-03 15:18:09 -05:00
Cody Wyatt Neiman 4c60b1dabf
Merge branch 'master' into synapse-s3-sse-c 2023-01-03 14:31:02 -05:00
Cody Wyatt Neiman 12b8cb3aab
Fix localpart slack id regex for mautrix-slack 2023-01-02 21:58:52 -05:00
Cody Wyatt Neiman e977242022
Pull more mautrix-slack defaults from upstream 2023-01-02 21:31:04 -05:00
Cody Wyatt Neiman f4874d2e4a
Pull upstream mautrix-slack config defaults 2023-01-02 21:09:40 -05:00
Cody Wyatt Neiman 2e0dfb2dc1
Update slack bridge implementation 2023-01-02 20:07:04 -05:00
Cody Wyatt Neiman d07480a883
Remove hardcoded matrix-postgres references 2023-01-02 19:23:14 -05:00
Cody Wyatt Neiman 97c45676de
Update paths and vars for mautrix-slack to roles/custom 2023-01-02 19:13:58 -05:00
Cody Wyatt Neiman d6022d851e
Move mautrix-sack role files to new roles/custom path 2023-01-02 19:13:49 -05:00
Cody Wyatt Neiman 6fb0f26b30
Add mautrix/appservice slack bridge bot username checks 2023-01-02 19:13:49 -05:00
Cody Wyatt Neiman 784e5492d5
Add matrix-bridge-mautrix-slack role 2023-01-02 19:13:17 -05:00
Slavi Pantaleev 1abba4c918 Upgrade matrix-corporal (2.5.0 -> 2.5.1) 2023-01-02 14:39:54 +02:00
Slavi Pantaleev 73e689e48e Fix --tags=register-user not working on Dendrite due to broken Jinja syntax
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2369
2022-12-31 17:33:46 +02:00
Slavi Pantaleev ba09705f7f Make Jitsi auth setup not show credentials in the shell
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2363
2022-12-26 07:58:32 +02:00
Aine 6795fe3578
Update ntfy 1.29.1 -> 1.30.1 2022-12-23 15:46:33 +00:00
Aine 8b2a86e35e
update beeper-linkedin 0.5.3 -> 0.5.4 2022-12-23 13:00:35 +02:00
Kuchenmampfer d1442dec15
Upgrade Signald
Fixes the following issue when trying to use the !pm <phone number> command: https://gitlab.com/signald/signald/-/issues/345
2022-12-22 22:31:38 +00:00
adam-kress bef4fe5d9e
Update element v1.11.16 -> v1.11.17 2022-12-21 13:16:09 -05:00
Samuel Meenzen 0179b0f165
Remove conduit workaround
Conduit update 0.5.0 fixed the issue, so this is no longer needed.
2022-12-21 18:28:34 +01:00
Samuel Meenzen 33fb5a4665
Upgrade Conduit (0.4.0 -> 0.5.0) 2022-12-21 18:21:49 +01:00
Slavi Pantaleev 40aa42e982 Add reference to push.enabled to homeserver.yaml
Related to:

- https://github.com/matrix-org/synapse/pull/14551/files
- https://github.com/matrix-org/synapse/pull/14619/files
2022-12-21 06:43:43 +02:00
Slavi Pantaleev 42c4f0450d Upgrade Prometheus (2.40.7 -> 2.41.0) 2022-12-20 21:37:19 +02:00
Slavi Pantaleev d0b2a50768 Upgrade Hydrogen (v0.3.5 -> v0.3.6) 2022-12-20 21:36:39 +02:00
Joe Kappus deabd79452
Upgrade Synapse (1.73.0 -> 1.74.0)
Signed-off-by: Joe Kappus <joe@wt.gd>
2022-12-20 14:07:14 -05:00
Catalan Lover 5e30f6d4c4
Update Mjolnir from 1.5.0 to 1.6.1
Please note that This Mjolnir version bump technnically is missing some extra stuff that mjolnir claims we should do but it didnt work when i tried it and well my mjolnir deployment has been running this since release day almost and its fine. No errors in log that are unexpected. (Mjolnir throws errors in the log for anyone who wonders for various things that are fine. Like if a protection is off that is an error. Its due to how matrix-bot-lib works.)
2022-12-19 15:33:58 +01:00
Slavi Pantaleev f2e68469cb Upgrade nginx (1.23.2 -> 1.23.3) 2022-12-19 12:32:43 +02:00
Slavi Pantaleev 576eb0006c Upgrade Grafana (9.3.1 -> 9.3.2) 2022-12-17 22:49:34 +02:00
Slavi Pantaleev a7d39b109a Upgrade Redis (7.0.6 -> 7.0.7) 2022-12-17 22:48:48 +02:00
Slavi Pantaleev fa73513064 Upgrade mautrix-whatsapp (0.7.2 -> 0.8.0) 2022-12-17 22:47:38 +02:00
Aine 455b8aff15
Update prometheus 2.40.6 -> 2.40.7 2022-12-14 10:32:14 +00:00
Slavi Pantaleev 60127cdffd
Merge pull request #2339 from etkecc/patch-135
update redis 7.0.5 -> 7.0.6
2022-12-14 07:31:36 +02:00
Slavi Pantaleev 190f241bf5
Merge pull request #2340 from etkecc/patch-136
Update jitsi stable-8138 -> stable-8138-1
2022-12-14 07:31:31 +02:00
Aine bd0f21588f
Update jitsi stable-8138 -> stable-8138-1 2022-12-13 22:49:10 +00:00
Aine 07ca0267f1
update redis 7.0.5 -> 7.0.6 2022-12-13 22:47:30 +00:00
Aine f642f6fae7
update mautrix-instagram 0.2.2 -> 0.2.3 2022-12-13 22:45:52 +00:00
Slavi Pantaleev 1f593f708f Upgrade Jitsi (stable-8044 -> stable-8138)
Untested
2022-12-12 19:00:55 +02:00
Slavi Pantaleev 3f4ab0bd7e Upgrade Redis (7.0.4 -> 7.0.5) 2022-12-12 19:00:55 +02:00
Slavi Pantaleev e8ed318908
Merge pull request #2335 from gardar/fix-tag-typo
fix: unclosed tags typo
2022-12-12 08:18:03 +02:00
gardar b9afcead42 fix: unclosed tags typo 2022-12-11 23:25:59 +00:00
ikkemaniac 108ada75e8 update dashboard, fix typo, fix using original user ip
improve nginxlog matches to group URI's
2022-12-11 22:41:12 +01:00
Slavi Pantaleev f69d90c1e6 Upgrade Prometheus (2.40.5 -> 2.40.6) 2022-12-11 18:29:13 +02:00
Slavi Pantaleev 86d177266a Upgrade matrix-corporal (2.4.0 -> 2.5.0) 2022-12-11 18:29:13 +02:00
Slavi Pantaleev b0030bd62f
Merge pull request #2333 from mattcen/hydrogen-prebuilt-docker
Use upstream Docker image for amd64 rather than self-build
2022-12-11 17:01:48 +02:00
Matthew Cengia 3453fff901
Use upstream Docker image for amd64 rather than self-build 2022-12-11 21:25:43 +11:00
Slavi Pantaleev 2b89d5d92f Upgrade exim-relay (4.95-r0-4 -> 4.96-r1-0) 2022-12-11 11:45:47 +02:00
Luke Moch dd51ad2ba2 fail if matrix_synapse_ext_synapse_s3_storage_provider_config_endpoint_url 'not' startswith('http') 2022-12-10 08:13:55 -05:00
Slavi Pantaleev d81e7d6328 Make matrix_synapse_ext_synapse_s3_storage_provider_config_endpoint_url required
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2330
2022-12-10 10:37:01 +02:00
Slavi Pantaleev 3824139908 Rename inject_into_nginx_proxy.yml to init.yml when it does more than injection 2022-12-09 10:18:40 +02:00
Slavi Pantaleev f186d6236d Add some missing tags to Synapse role
Without these:

- `--tags=install-synapse` and `--tags=install-all` would be incomplete
and will not contain Synapse worker configuration

- `--tags=install-synapse-reverse-proxy-companion` and
  `--tags=setup-synapse-reverse-proxy-companion` would not contain
  Synapse worker configuration
2022-12-09 10:15:40 +02:00
Dan Arnfield 5823f1f298 Only delete playbook scripts from /usr/local/bin 2022-12-07 13:26:02 -06:00
Rhys fd79140201
Changes to allow a user to set the max participants on a jitsi conference (#2323)
* Changes to allow a user to set the max participants on a jitsi
conference

* changed var name from jitsi_max_participants to matrix_prosody_jitsi_max_participants
2022-12-07 17:54:58 +02:00
ikkemaniac 8ebf18a885
add prometheus-nginxlog-exporter role (#2315)
* add prometheus-nginxlog-exporter role

* Rename matrix_prometheus_nginxlog_exporter_container_url to matrix_prometheus_nginxlog_exporter_container_hostname

* avoid referencing variables from other roles, handover info using group_vars/matrix_servers

* fix: stop service when uninstalling

fix: typo

move available arch's into a var

fix: text

* fix: prometheus enabled condition

Co-authored-by: ikkemaniac <ikkemaniac@localhost>
2022-12-07 16:58:36 +02:00
Aine fda65a0a56
postmoogle - add missing join()s 2022-12-07 11:38:47 +00:00
Aine ba13231c58
update postmoogle 0.9.9 -> 0.9.10 2022-12-06 22:51:17 +02:00
Aine ba4580a1fd
Update element v1.11.15 -> v1.11.16 2022-12-06 14:50:56 +00:00
Slavi Pantaleev 9edc7da67d Do not specify now-unnecessary worker_main_http_uri Synapse worker setting
Related to

- c15e9a0edb
- 01a0527892
2022-12-06 15:54:06 +02:00
Slavi Pantaleev 13e7399104 Handle /timestamp_to_event via Synapse workers
Related to 8f10c8b054
2022-12-06 15:52:16 +02:00
Slavi Pantaleev 663fe29ddb Do not specify start_pushers in Synapse config
It's unnecessary when `pusher_instances` is populated.

Source: 6acb6d772a
2022-12-06 15:49:56 +02:00
Slavi Pantaleev 135bb5af3e Do not specify send_federation in Synapse config
It's unnecessary when `federation_sender_instances` is populated.

Source: 6acb6d772a
2022-12-06 15:49:28 +02:00
Slavi Pantaleev 84d529b542 Upgrade Synapse (v1.72.0 -> v1.73.0)
Synapse Worker configuration updates are coming later.
2022-12-06 15:47:07 +02:00
Slavi Pantaleev b1c77f9bf2 Add comment to matrix-backup-borg.service
Related to 8005557061
2022-12-05 15:45:33 +02:00
Slavi Pantaleev 8005557061 Give backup-borg container more permissions to perform the backup
Running with a user (like `matrix:matrix`) fails if Etherpad is enabled,
because `/matrix/etherpad` is owned by `matrix_etherpad_user_uid`/`matrix_etherpad_user_gid` (`5001:5001`).

The `matrix` user can't acccess the Etherpad directory for this reason
and Borgmatic fails when trying to make a backup.

There may be other things under `/matrix` which similarly use
non-`matrix:matrix` permissions.

Another workaround might have been to add `/matrix/etherpad` (and
potentially other things) to `matrix_backup_borg_location_exclude_patterns`, but:

- that means Etherpad won't be backed up - not great
- only excluding Etherpad may not be enough. There may be other files we
  need to exclude as well

---

Running with `root` is still not enough though.

We need at least the `CAP_DAC_OVERRIDE` capability, or we won't be able to read the
`/etc/borgmatic.d/config.yaml` configuration file (owned by
`matrix:matrix` with `0640` permissions).

---

Additionally, it seems like the backup process tries to write to at least a few directories:
- `/root/.borgmatic`
- `/root/.ssh`
- `/root/.config`

> [Errno 30] Read-only file system: '/root/.borgmatic'
> Error while creating a backup.
> /etc/borgmatic.d/config.yaml: Error running configuration file

We either need to stop mounting the container filesystem as readonly
(remove `--read-only`) or to allow writing via a `tmpfs`.

I've gone the `tmpfs` route which seems to work.

In any case, the mounted source directories (`matrix_backup_borg_location_source_directories`)
are read-only regardless, so our actual source files are protected from unintentional changes.
2022-12-05 15:42:57 +02:00
Slavi Pantaleev 64b03c2dfd Fix backup-borg repository initialization for borgmatic 1.7+ (or borg 2.0) 2022-12-05 15:00:11 +02:00
Slavi Pantaleev 1f1a3dfc38 Ensure database port is passed to Borg as an integer
Without this, it's a string and borg says:

> At 'hooks.postgresql_databases[INDEX_HERE].port': '5432' is not of type 'integer'
> /etc/borgmatic/config.yaml /etc/borgmatic.d /tmp/.config/borgmatic/config.yaml /tmp/.config/borgmatic.d: No valid configuration files found

.. and fails to do anything.
2022-12-05 14:42:02 +02:00
Slavi Pantaleev d8df03dfc9 Mark Postgres v15 as supported for borg backup
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2257

Fixed in d134cd7c4c
(thanks to `alpine:latest` now being `alpine:3.17.0`, which includes
Postgres v15)
2022-12-05 11:46:49 +02:00
Slavi Pantaleev b2a40effaf Fix Element self-building by switching to docker-buildx
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2318
2022-12-05 10:02:54 +02:00
Slavi Pantaleev 6414599079 Upgrade Coturn (4.6.0 -> 4.6.1) 2022-12-05 09:46:11 +02:00
Slavi Pantaleev 7464604ddd Make use of matrix_synapse_ext_s3_storage_provider_data_path in a few more places 2022-12-04 10:17:55 +02:00
Quentin Young b31731ebf8 fix s3 storage provider not ensuring data dir
This path is accessed by the s3 storage provider stuff and needs to be
ensured.

Broken by 7c5c3aedc
2022-12-04 01:16:58 -05:00
Slavi Pantaleev ceb2c30277 Upgrade mautrix-signal (v0.4.1 -> v0.4.2) 2022-12-03 15:37:17 +02:00
Slavi Pantaleev d59bbfdfc9 Upgrade Hookshot (2.4.0 -> 2.5.0) 2022-12-02 19:15:04 +02:00
Slavi Pantaleev a353bda7a1 Upgrade appservice-slack (2.0.1 -> 2.0.2) 2022-12-01 23:30:09 +02:00
Slavi Pantaleev 9e93030159 Upgrade Grafana (9.3.0 -> 9.3.1) 2022-12-01 23:29:33 +02:00
Aine ea401170e1
Update prometheus 2.40.4 -> 2.40.5 2022-12-01 15:16:33 +00:00
Aine 8ca6cdd016
fix hookshot role 2022-11-30 12:25:51 +00:00
Slavi Pantaleev e3d21e8096 Rename some default Hookshot variables
Fixup for 7e2e2626a0

Some references were left unrenamed which caused `validate_config.yml`
to trigger.
2022-11-30 11:55:23 +02:00
Slavi Pantaleev dc817f30ce Upgrade Grafana (9.2.7 -> 9.3.0) 2022-11-30 11:50:21 +02:00
Slavi Pantaleev 9d5b5d7a01
Merge pull request #2308 from etkecc/patch-129
Update grafana 9.2.6 -> 9.2.7
2022-11-30 11:28:39 +02:00
Slavi Pantaleev 4eed49f931 Replace custom/matrix-postgres-backup role with galaxy/com.devture.ansible.role.postgres_backup
This role is usable on its own and it's not tied to Matrix, so
extracting it out into an independent role that we install via
ansible-galaxy makes sense.

This also fixes the confusion from the other day, where
`matrix_postgres_*` had to be renamed to `devture_postgres_*`
(unless it was about `matrix_postgres_backup_*`).
We now can safely say that ALL `matrix_postgres_*` variables need to be
renamed.

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2305
2022-11-30 11:01:19 +02:00
Aine d37adfba4e
Update grafana 9.2.6 -> 9.2.7 2022-11-30 08:48:07 +00:00
Aine 65019a5774
Update prometheus 2.40.2 -> 2.40.4 2022-11-30 08:30:50 +00:00
Slavi Pantaleev bc64d8ed9a Upgrade prometheus-node-exporter (v1.4.0 -> v1.5.0) 2022-11-30 08:32:29 +02:00
Slavi Pantaleev 4a62df2ea3 Make Hookshot logging-level configurable 2022-11-30 08:18:41 +02:00
Slavi Pantaleev 84f306b236 Add support for enableHttpGet and waitForComplete Hookshot options
Supersedes https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2256
2022-11-30 08:16:58 +02:00
Slavi Pantaleev 7e2e2626a0 Make hookshot variable names consistent with the rest of the playbook
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2256
2022-11-30 08:13:39 +02:00
Array in a Matrix d5e8d2a939
update dendrite 2022-11-29 11:58:00 -05:00
Slavi Pantaleev 8c5e34b37f Upgrade ddclient (v3.10.0-ls105 -> v3.10.0-ls106) 2022-11-29 08:20:36 +02:00
Slavi Pantaleev 4b2d30a474 Fix matrix_dendrite_client_api_turn_shared_secret not being defined
Regression since https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2290
2022-11-28 18:33:18 +02:00
Slavi Pantaleev 5b26647127 Upgrade Certbot (v1.31.0 -> v2.0.0) and switch to new default key type (ecdsa)
More details about the new key type can be found here:
https://eff-certbot.readthedocs.io/en/stable/using.html#rsa-and-ecdsa-keys

Existing RSA-based keys will continue to renew as RSA until manual
action is taken. Example from the documentation above:
> certbot renew --key-type ecdsa --cert-name example.com --force-renewal

In the future, we may add a command which does this automatically for
all domains.
2022-11-28 09:24:25 +02:00
Slavi Pantaleev 4b111d05d5 Pass devture_postgres_db_migration_request to com.devture.ansible.role.postgres in a cleaner way 2022-11-28 07:44:59 +02:00
Slavi Pantaleev 910cd9adf0 Replace import_role calls with include_role calls 2022-11-27 11:27:01 +02:00
Slavi Pantaleev 3d1ea3e79e Auto-delete old matrix scripts from /usr/local/bin 2022-11-27 10:10:00 +02:00
Slavi Pantaleev d1b2fd50be Remove manual service enablement/start for backup-borg
This is done via devture_systemd_service_manager_services_list_auto
already.
2022-11-27 10:04:03 +02:00
Slavi Pantaleev 2688e8bfc3 Optimize initial installation by not reloading systemd after each .service install
We expect `--tags=start` to handle systemd reloading, so we don't need
to do it manually each time we install/uninstall a .service file.
2022-11-27 10:02:45 +02:00
Slavi Pantaleev 707e909b9b /usr/local/bin/matrix-ssl-lets-encrypt-certificates-renew -> /matrix/ssl/bin/lets-encrypt-certificates-renew 2022-11-27 09:53:23 +02:00
Slavi Pantaleev fb86f6d5e7 /usr/local/bin/matrix-remove-all -> /matrix/bin/remove-all 2022-11-27 09:47:02 +02:00
Slavi Pantaleev c928148261 Make uninstall tasks for Synapse delete bin/ 2022-11-27 09:43:25 +02:00
Slavi Pantaleev 40cf9cd72c /usr/local/bin/matrix-dendrite-create-account -> /matrix/dendrite/bin/create-account 2022-11-27 09:42:10 +02:00
Slavi Pantaleev 7c5c3aedc4 Put s3-storage-provider scripts under /matrix/synapse/ext/s3-storage-provider/bin, not /usr/local/bin 2022-11-27 09:38:34 +02:00
Slavi Pantaleev 735e7355a5 Rename variable (matrix_synapse_ext_s3_storage_provider_path -> matrix_synapse_ext_s3_storage_provider_base_path) 2022-11-27 09:28:29 +02:00
Slavi Pantaleev 72744f9db9 /usr/local/bin/matrix-synapse-register-user -> /matrix/synapse/bin/register-user 2022-11-27 09:26:18 +02:00
Slavi Pantaleev 7b43ef34b7 Remove more hardcoded matrix-postgres references 2022-11-27 09:16:18 +02:00
Slavi Pantaleev 3d5d843418 Replace some devture_postgres_identifier instances with devture_postgres_connection_hostname 2022-11-27 08:31:54 +02:00
Slavi Pantaleev eedf5ad94d Remove some hardcoded matrix-postgres references 2022-11-27 08:23:43 +02:00
Slavi Pantaleev 04b9483f0d Switch from matrix-postgres to com.devture.ansible.role.postgres 2022-11-27 08:04:31 +02:00
Slavi Pantaleev dd9ae0d25c Fix accidentally swapped tags (rust-synapse-compress-state and update-user-password) 2022-11-27 07:24:39 +02:00
Aine ea0c9ed71d
update mautrix-telegram 0.12.1 -> 0.12.2 2022-11-26 18:48:04 +00:00
Array in a Matrix 504d4a4134
Add dendrite captcha config to doc and hCaptcha (#2290)
* added dendrite captcha options

* added hcaptcha doc

* proper url

* Apply suggestions from code review

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

* Update main.yml

* renamed captcha vars to new naming scheme

* change vars to new format

* Rename back some incorrect renamed variables

These variables are either not just part of the `client_api` subsection,
or are not even part of that section at all. They shouldn't have been
renamed in baaef2ed616e2645550d9

* Fix up naming inconsistencies

Some of these variables had been renamed in one place,
but not in other places, so it couldn't have worked that way.

* Add validation/deprecation for renamed Dendrite variables

Related to 4097898f885cf4c73, baaef2ed616e2645550, 68f4418092fa8ad
and a0b4a0ae6b2f1f18

Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2022-11-26 09:27:43 +02:00
Slavi Pantaleev 16c18b0344 Upgrade Hydrogen (v0.3.4 -> v0.3.5) 2022-11-25 18:59:01 +02:00
Slavi Pantaleev fa523c6472 Remove blank lines 2022-11-25 17:36:42 +02:00
Slavi Pantaleev a04f6f4e3d Optimize uninstall tasks a bit
- forego removing Docker images - it's not effective anyway, because it
  only removes the last version.. which is a drop in the bucket, usually

- do not reload systemd - it's none of our business. `--tags=start`,
  etc., handle this

- combine all uninstall tasks under a single block, which only runs if
  we detect traces (a leftover systemd .service file) of the component.
  If no such .service is detected, we skip them all. This may lead to
  incorect cleanup in rare cases, but is good enough for the most part.
2022-11-25 17:28:57 +02:00
Slavi Pantaleev 61f67d8f0a Add install-* tags for quicker runs 2022-11-25 16:02:51 +02:00
Slavi Pantaleev 42f3c3cbf6 Improve command for connecting to additional container networks 2022-11-25 10:22:25 +02:00
Slavi Pantaleev b59981f03c Remove incorrectly places task
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2297
2022-11-25 06:17:14 +02:00
Karmanyaah Malhotra 140acfcc5f
Exempt Matrix server from ntfy rate limit (#2135)
* Exempt Matrix server from ntfy rate limit

Add the matrix fqdn and localhost to ntfy's exemption list.
Also allow all ntfy rate limits to be configured through Ansible
variables.

* Fix names and formatting

* fixes

* tabs not spaces

* Lint

* Use raw tags instead of bracket soup
2022-11-24 21:12:43 +02:00
Slavi Pantaleev 9c0cf5481a Try to be more helpful when matrix_homeserver_generic_secret_key appears to be undefined 2022-11-24 18:42:01 +02:00
Slavi Pantaleev 663a17ea10 Fix ansible-lint-reported errors 2022-11-24 17:39:34 +02:00
Slavi Pantaleev c37cf42427 Do not delete and re-create Synapse worker configs needlessly
We had checks to avoid stopping/deleting systemd services for workers
that used to exist and will continue to exist, but we were deleting
config files for workers each time.. Only to recreate them again later.

This lead to:

- too many misleading "changed" tasks
- too much unnecessary work
- potential failures during playbook execution possibly leaving the
  system in a bad state (no worker config files)
2022-11-24 17:06:31 +02:00
Slavi Pantaleev 2e7b5c7b02 Untangle the setup import/include mess in matrix-synapse 2022-11-24 16:27:11 +02:00
Slavi Pantaleev d29b0aeddb Replace even more import_tasks calls with include_tasks 2022-11-24 15:19:42 +02:00
Slavi Pantaleev 7c2a7a8eb6 Replace most import_tasks calls with include_tasks for improved performance 2022-11-24 11:33:45 +02:00
Aine e05b4c78c7
Update grafana 9.2.5 -> 9.2.6 2022-11-23 16:02:28 +00:00
Slavi Pantaleev 787a82d6e8 Combine matrix user/group set_fact calls into one 2022-11-23 17:07:52 +02:00
Slavi Pantaleev 4d881477a3 Add matrix_homeserver_enabled variable
We need this to control whether `('matrix-' + matrix_homeserver_implementation + '.service')`
would get injected into `devture_systemd_service_manager_services_list_auto`
2022-11-23 16:56:39 +02:00
Slavi Pantaleev dd4f8df905 Remove unnecessary matrix_dendrite_role_executed 2022-11-23 16:15:33 +02:00
Slavi Pantaleev 8c180306ab Remove unnecessary matrix_conduit_role_executed 2022-11-23 16:14:59 +02:00
Slavi Pantaleev 07c23b7cb0 Remove matrix_synapse_role_executed and various tasks that check it
This was useful when the order of these roles in relation to Synapse
mattered (when we were injecting stuff into Synapse variables during
runtime). This is no longer the case since 0ea7cb5d18, so all of
this can be removed.
2022-11-23 16:13:07 +02:00
Slavi Pantaleev 735bacca89 Do not run matrix-nginx-proxy config injection tasks unless necessary
These `init.yml` (now `inject_into_nginx_proxy.yml`) tasks do not need
to `always` run. They only need to run for `setup-all` and
`setup-nginx-proxy`. Unless we're dealing with these 2 tags, we can
spare ourselves a lot of work.

This patch also moves the `when` statement from `init.yml` into
`main.yml` in an effort to further optimize things by potentially
avoiding the extra file include.
2022-11-23 15:52:58 +02:00
Slavi Pantaleev d829884642 Remove some old checks 2022-11-23 14:59:05 +02:00
Slavi Pantaleev ccfaefa4d2 Add service groups 2022-11-23 11:45:47 +02:00
Slavi Pantaleev 93d4f8d425 Replace matrix-common-after systemd service management with com.devture.ansible.role.systemd_service_manager 2022-11-23 11:45:46 +02:00
Slavi Pantaleev eec5de7aba Remove old systemd service checks
These are not even caused by Archlinux, but by running buggy Ansible on old Ubuntu
while targeting modern servers (like Archlinux, but also others, ..).

We shouldn't employ ugly workarounds like this. We should tell people to
avoid running buggy Ansible or bad distros like Ubuntu, even.
2022-11-23 11:45:46 +02:00
Slavi Pantaleev 360e643f84 Add service priorities - try to stop/start them in an optimal order 2022-11-23 11:45:46 +02:00
Slavi Pantaleev 0ea7cb5d18 Remove various init.yml files - initialize systemd services, etc., statically (not at runtime) 2022-11-23 11:45:46 +02:00
Aine 5c4d4dc514
Update element 1.11.14 -> 1.11.15 2022-11-22 21:41:43 +00:00
Array in a Matrix 11ea49075d
Update main.yml 2022-11-22 11:16:19 -05:00
Array in a Matrix 70be6eb323
Update dendrite.yaml.j2 2022-11-22 11:13:53 -05:00
Slavi Pantaleev e37db0c888 Upgrade Synapse (v1.71.0 -> v1.72.0) 2022-11-22 16:41:14 +02:00
Slavi Pantaleev b90956069c Fix matrix_architecture sanity check 2022-11-22 09:25:29 +02:00
Slavi Pantaleev 2ad6bd87c7 Determine matrix_architecture automatically 2022-11-22 09:22:56 +02:00
Slavi Pantaleev a98f249e40 Remove old cleanup tasks 2022-11-22 09:02:37 +02:00
Slavi Pantaleev d8f2141eb0 Install Docker via geerlingguy.docker Galaxy role 2022-11-22 09:01:26 +02:00
Slavi Pantaleev 7ac27becaf Upgrade ddclient (v3.10.0-ls103 -> v3.10.0-ls105) 2022-11-22 08:33:54 +02:00
Slavi Pantaleev 6a870a07b2 Fix ansible-lint-reported errors 2022-11-20 18:02:50 +02:00
Slavi Pantaleev e9e84341a9 Reverse-proxy to Synapse via matrix-synapse-reverse-proxy-companion
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2090
2022-11-20 16:43:33 +02:00
Array in a Matrix 7cc668489b
add auto join option to dendrite config (#2255)
* add auto join option to dendrite config

* added   auto_join_rooms: variable

* added "configuring dendrite" entry

* created dendite configuration documentation

* fixed config path

* Update docs/configuring-playbook-dendrite.md

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

* Update docs/configuring-playbook-dendrite.md

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

* Update docs/configuring-playbook-dendrite.md

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

* Update docs/configuring-playbook-dendrite.md

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

* Update docs/configuring-playbook-dendrite.md

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

* Update roles/custom/matrix-dendrite/defaults/main.yml

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

* correction

Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2022-11-20 10:11:21 +02:00
Aine eec7970689
update postmoogle 0.9.8 -> 0.9.9 2022-11-19 00:55:03 +02:00
NullIsNot0 77451c6a71
Enable location sharing in Element (#2276)
* Enable location sharing in Element

* Update roles/custom/matrix-client-element/tasks/validate_config.yml

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

* Update roles/custom/matrix-client-element/tasks/setup_install.yml

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

* Rename location sharing vars to be consistent with other vars

* Rename style.json to map_style.json

* Add m.tile_server section to /.well-known/matrix/client

Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2022-11-18 15:07:53 +02:00
Warren Bailey 84c74136ea
Provision extra Jitsi JVB services on additional hosts (#2166)
* Add task to configure a standalone JVB on a different server

* add missing file

* set nginx config

* update prosody file and expose port 5222

* change variable name to server id

* formatting change

* use server id of jvb-1 for the main server

* adding documentation

* adding more jvbs

* rename variable

* revert file

* fix yaml error

* minor doc fixes

* renaming tags and introducing a common tag

* remove duplicates

* add mapping for jvb to hostname/ip

* missed a jvb_server

* Update roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-jitsi.conf.j2

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

* PR review comments and additional documentation

* iterate on dict items

* Update docs/configuring-playbook-jitsi.md

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

* Update docs/configuring-playbook-jitsi.md

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

* Update docs/configuring-playbook-jitsi.md

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

* Update docs/configuring-playbook-jitsi.md

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

* Update docs/configuring-playbook-jitsi.md

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

* Update docs/configuring-playbook-jitsi.md

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

* Update docs/configuring-playbook-jitsi.md

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

* adding documentation around the xmpp setting

* add common after

* reduce the number of services during init of the additional jvb

* remove rogue i

* revert change to jitsi init as it's needed

* only run the jvb service on the additional jvb host

* updating docs

* reset default and add documentation about the websocket port

* fix issue rather merge with master

* add missing role introduced in master

* this role is required too

* Adding new jitsi jvb playbook, moving setup.yml to matrix.yml and creating soft link

* updating documentation

* revert accidental change to file

* add symlink back to roles to aid running of the jitsi playbook

* Remove extra space

* Delete useless playbooks/roles symlink

* Remove blank lines

Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2022-11-18 14:00:27 +02:00
Warren Bailey 45c0467745
Sentry DNS setting in Jitsi jvb and jicofo (#2274)
* Jitsi control sentry dns using vars

* renaming variables

* Revert "renaming variables"

This reverts commit 4146c48f6a2e71d1b0d3f58c767aea1b2f4f789c.

* set to connection string or 0 to disable

* Update comments

* Use empty string for default Sentry DSN variables

Both should work identically, but an empty string seems better

Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2022-11-18 13:31:40 +02:00
Aine 9106033949
Update ntfy 1.29.0 -> 1.29.1 2022-11-18 06:21:57 +00:00
Aine 6a71b3fab3
update prometheus 2.40.1 -> 2.40.2 2022-11-17 17:22:04 +00:00
Aine 795dcb112b
Update grafana 9.2.4 -> 9.2.5 2022-11-16 19:14:17 +00:00
Slavi Pantaleev 3a053a26de
Merge pull request #2262 from llasse/add-ma1sd-dockernetworks
added matrix_ma1sd_container_additional_networks
2022-11-16 15:44:35 +02:00
Aine 79512d5851
Update mautrix-whatsapp 0.7.1 -> 0.7.2 2022-11-16 10:47:38 +00:00
Aine 1c55827ed0
Update mautrix-googlechat 0.3.3 -> 0.4.0 2022-11-16 06:17:30 +00:00
Slavi Pantaleev a93308d190
Merge pull request #2266 from etkecc/patch-119
Update jitsi stable-7882 -> stable-8044
2022-11-15 18:01:39 +02:00
Aine 25996b4fa9
Update jitsi stable-7882 -> stable-8044 2022-11-15 15:50:46 +00:00
Aine 94f2e06e83
Update mautrix-facebook 0.4.0 -> 0.4.1 2022-11-15 15:49:32 +00:00
Llasse 1387e776ca added matrix_ma1sd_container_additional_networks similar to matrix_nginx_proxy_container_additional_networks 2022-11-13 20:40:23 +01:00
Cody Wyatt Neiman b6bb5731cd
Remove leftover sse-c enabled cmd check 2022-11-13 03:20:30 -05:00
Cody Wyatt Neiman a7320e02ff
Adjust sse-c template formatting 2022-11-13 03:18:53 -05:00
Aine c68def0809
Update ntfy 1.28.0 -> 1.29.0 2022-11-12 22:01:31 +00:00
Aine 19b59f9ded
Update Hydrogen 0.3.3 -> 0.3.4 2022-11-10 17:56:59 +00:00
Cody Wyatt Neiman 384da4f34f
Add S3 SSE-C support to synapse-s3-storage-provider 2022-11-09 16:16:33 -05:00
Aine ea0c7e27e3
Update prometheus 2.40.0 -> 2.40.1 2022-11-09 15:32:09 +00:00
Aine 65e340519d
Update element v1.11.13 -> v1.11.14 2022-11-08 16:24:33 +00:00
Slavi Pantaleev 51674887ff Fix Synapse pusher_instances not being populated correctly
This caused push notifications to be delivered more than once
if multiple `pusher` workers were enabled.
2022-11-08 17:40:44 +02:00
Slavi Pantaleev 59c6d37ebc
Merge pull request #2245 from etkecc/patch-113
Update prometheus 2.39.1 -> 2.40.0
2022-11-08 16:54:49 +02:00
Aine 6c2612a1a6
Update prometheus 2.39.1 -> 2.40.0 2022-11-08 14:29:37 +00:00
Aine 67d0709ea6
Update Grafana 9.2.3 -> 9.2.4 2022-11-08 14:28:37 +00:00
Slavi Pantaleev 7871a92b04 Upgrade Synapse (v1.70.1 -> v1.71.0) 2022-11-08 16:25:52 +02:00
Aine a4dbc27f34
remove etherpad nginx config automatically 2022-11-05 19:40:09 +02:00
drelephant 5642586820
Merge branch 'spantaleev:master' into fixgradle 2022-11-06 00:39:42 +11:00
mouse 5e1bcf3f76 stop gradle pacman error on ubuntu 2022-11-06 00:20:44 +11:00
Aine e3b3f07607
etherpad: add abiword and soffice config options 2022-11-05 13:19:00 +02:00
Slavi Pantaleev 663f0bc5ef Install openssl using ansible.builtin.package, not using a distro-specific package manager module
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2228
2022-11-05 12:10:59 +02:00
Slavi Pantaleev 5ef70015cb Ensure git is installed using ansible.builtin.package, not using a distro-specific package manager module
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2228
2022-11-05 12:09:32 +02:00
Slavi Pantaleev 13b63eabf0
Merge pull request #2229 from etkecc/make-etherpad-great-again
standalone etherpad
2022-11-05 11:54:51 +02:00
Slavi Pantaleev 805b70bfa3 Announce standalone Etherpad 2022-11-05 11:47:47 +02:00
Aine 39e4b419dd
matrix-etherpad: fail when mode is 'dimension', but dimension is disabled 2022-11-05 09:29:53 +02:00
Slavi Pantaleev 2473cd655b Include ensure_openssl_installed and ensure_fuse_installed utils in a more reliable way
This fixes a regression since the change done in c1c152f7ac.
When another role (say `matrix-jitsi`) included `roles/custom/matrix-base/tasks/util/ensure_openssl_installed.yml`,
which then included `{{ role_path }}/tasks/util/ensure_openssl_installed_DISTRO.yml`,
that `role_path` variable would end up being the parent role
(`matrix-jitsi`) and not the `matrix-base` role, so we'd get a failure.

An alternative solution may have been to avoid using `role_path`, but
importing roles properly (like we've done in this patch) sounds like a better way.

Unfortunately, `import_role` fails if `tasks_from` is something like
`util/ensure_openssl_installed` (containing a `/`), so I had to move
these utils out of `util/`.

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2228
2022-11-05 09:18:58 +02:00
Aine 06eb186729
add matrix_etherpad_mode 2022-11-05 09:17:47 +02:00
Slavi Pantaleev c1c152f7ac Include potentially distro-specific tasks at runtime
This avoids Ansible trying to ensure `community.general.pacman` is
available, even if that module will never run (because `when` says so).

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2228
2022-11-05 08:31:22 +02:00
Slavi Pantaleev 264d1716e0
Merge pull request #2230 from etkecc/fix-workers-yaml-include-path
Keep Synapse worker definitions in vars.yml to avoid an extra file include on each playbook task
2022-11-05 07:45:13 +02:00
Slavi Pantaleev 6c524302d6 Add intentionally-ignored-endpoints to intentionally-ignored-endpoints for completeness 2022-11-05 07:40:56 +02:00
Slavi Pantaleev a9e2607d80 Fix yaml[comments-indentation] in workers config and remove automation 2022-11-05 07:29:47 +02:00
Darren Rambaud 1c643263dd dendrite: update image tag to latest release (0.10.7)
- https://github.com/matrix-org/dendrite/releases/tag/v0.10.7
2022-11-04 15:16:14 -05:00
Aine da4a82c48b
remove old workers.yml (already saved into main.yml) 2022-11-04 19:02:24 +02:00
Aine 37d4bf0d1c
fix workers-doc-to-yaml 2022-11-04 18:55:57 +02:00
Aine 9b97957022
Merge branch 'master' into make-etherpad-great-again 2022-11-04 17:36:15 +02:00
Slavi Pantaleev a4e2a3bc07 Upgrade Hydrogen (v0.3.2 -> v0.3.3) 2022-11-04 17:07:29 +02:00
Slavi Pantaleev d3bd1ca024 matrix_*_retries_{count,delay} -> devture_playbook_help_*_retries_{count,delay} 2022-11-04 16:44:29 +02:00
Slavi Pantaleev 4f4c856e43 matrix_host_command_systemctl -> devture_systemd_docker_base_host_command_systemctl (via com.devture.ansible.role.systemd_docker_base) 2022-11-04 16:41:23 +02:00
Slavi Pantaleev 7086c0ebe3 matrix_host_command_sh -> devture_systemd_docker_base_host_command_sh (via com.devture.ansible.role.systemd_docker_base) 2022-11-04 16:40:25 +02:00
Slavi Pantaleev a9a81460ec matrix_host_command_docker -> devture_systemd_docker_base_host_command_docker (via com.devture.ansible.role.systemd_docker_base) 2022-11-04 16:39:35 +02:00
Slavi Pantaleev 835d2e9581 matrix_systemd_path -> devture_systemd_docker_base_systemd_path (via com.devture.ansible.role.systemd_docker_base) 2022-11-04 16:38:38 +02:00
Slavi Pantaleev f03f716989 matrix_systemd_unit_home_path -> devture_systemd_docker_base_systemd_unit_home_path (via com.devture.ansible.role.systemd_docker_base) 2022-11-04 16:37:47 +02:00
Slavi Pantaleev 04c6c11561 Install ntpd/systemd-timesync via com.devture.ansible.role.timesync 2022-11-04 16:34:23 +02:00
Slavi Pantaleev db19482d0c Replace matrix_playbook_runtime_results with devture_playbook_runtime_messages_list (via com.devture.ansible.role.playbook_runtime_messages) 2022-11-04 16:19:17 +02:00
Slavi Pantaleev c3a7237de7 Initial work on using externally defined roles 2022-11-04 14:58:28 +02:00
Aine 83c40fce15
standalone etherpad 2022-11-04 11:36:10 +02:00
Slavi Pantaleev 4cbea602dd Sync appservice-discord configuration with upstream 2022-11-03 11:50:40 +02:00
Slavi Pantaleev 995ef460e7 Upgrade appservice-discord (3.0.0 -> 3.1.0) 2022-11-03 11:46:12 +02:00
Slavi Pantaleev 410a915a8a Move roles/matrix* to roles/custom/matrix*
This paves the way for installing other roles into `roles/galaxy` using `ansible-galaxy`,
similar to how it's done in:

- https://github.com/spantaleev/gitea-docker-ansible-deploy
- https://github.com/spantaleev/nextcloud-docker-ansible-deploy

In the near future, we'll be removing a lot of the shared role code from here
and using upstream roles for it. Some of the core `matrix-*` roles have
already been extracted out into other reusable roles:

- https://github.com/devture/com.devture.ansible.role.postgres
- https://github.com/devture/com.devture.ansible.role.systemd_docker_base
- https://github.com/devture/com.devture.ansible.role.timesync
- https://github.com/devture/com.devture.ansible.role.vars_preserver
- https://github.com/devture/com.devture.ansible.role.playbook_runtime_messages
- https://github.com/devture/com.devture.ansible.role.playbook_help

We just need to migrate to those.
2022-11-03 09:11:29 +02:00
Slavi Pantaleev e1cfb6e79f
Make yamllint happy 2022-11-03 07:42:08 +02:00
Samuel Meenzen c330b85de3
Merge branch 'spantaleev:master' into mautrix-discord-restricted-rooms-config 2022-11-02 20:36:04 +01:00
Slavi Pantaleev c96878275c
Merge pull request #2224 from Michael-Hollister/bugfix/fix-synapse-stream-writer-workers
Fixed filter for Synapse stream_writer HS config
2022-11-02 10:24:10 +02:00
Aine 0fd9f3d4f9
Pin mautrix-instagram to v0.2.2 2022-11-02 07:21:09 +00:00
Slavi Pantaleev 8a609e5cf2 Fix some ansible-lint-reported errors 2022-11-02 07:00:45 +02:00
Slavi Pantaleev e531b7aefd
Merge pull request #2217 from ikkemaniac/git-hash
Save the GIT hash when running the playbook to allow for easy recovery
2022-11-02 06:47:57 +02:00
Slavi Pantaleev d2aef10f33
Merge pull request #2223 from etkecc/patch-110
Update element 1.11.12 -> 1.11.13
2022-11-02 06:06:01 +02:00
Darren Rambaud 28d9ee8578 dendrite: update tag to v0.10.6
- update tag to latest dendrite release (https://github.com/matrix-org/dendrite/releases/tag/v0.10.6)
2022-11-01 14:12:52 -05:00
Michael Hollister b7bd68d3cb Fixed filter for Synapse stream_writer HS config 2022-11-01 13:11:11 -05:00
Slavi Pantaleev c3dc64b1d5 Add matrix-user-creator role - automatic user account creation support
We no longer ask users to create Matrix user accounts for these bots:

- Postmoogle
- Honoroit
- Reminder Bot

Other bots and services (matrix-registration-bot, maubot, mjolnir,
Dimension, etc.) require an Access Token to run (not a password),
so this new role doesn't help for them.

It does help for the above bots though, and for defining your own
"initial user accounts" in the `matrix_user_creator_users_additional`
variable.
2022-11-01 16:22:58 +02:00
Aine 501420f3cc
Update element 1.11.12 -> 1.11.13 2022-11-01 14:18:41 +00:00
Slavi Pantaleev 125ca5569d Use unique filter for matrix_postgres_import_roles_to_ignore and matrix_postgres_import_databases_to_ignore
Dendrite uses a lot of databases, but a single (`dendrite`) role, which
leads to `matrix_postgres_import_roles_to_ignore` being something like
`['dendrite', 'dendrite', 'dendrite', ...]` needlessly.

This leads to weird regexes being generated for
`matrix_postgres_import_roles_ignore_regex`.
It's not that it hurts, but it just looks odd.
2022-11-01 15:47:00 +02:00
Slavi Pantaleev a4662660d2 Do not wait needlessly when vacuuming or importing Postgres 2022-11-01 15:06:10 +02:00
Slavi Pantaleev 74b186a454 Fix "too many spaces after colon" ansible-lint error 2022-11-01 15:05:41 +02:00
Slavi Pantaleev 9fb21b89a8 Fix import-postgres/run-postgres-vacuum failures being suppressed
We were only reporting failures for when the async task didn't finish.
We also need to report a failure for when the task finished, but
returned a non-zero exit code.
2022-11-01 14:57:29 +02:00
Slavi Pantaleev 17caa13a71 Upgrade Grafana (9.2.2 -> 9.2.3) 2022-11-01 12:59:15 +02:00
Slavi Pantaleev f7b45fd440 Upgrade ddclient (v3.10.0-ls102 -> v3.10.0-ls103) 2022-11-01 12:58:22 +02:00
ikkemaniac 3a49b0077c fix ansible-lint errors 2022-11-01 09:23:55 +01:00
Slavi Pantaleev 3fc19295e2 Fix ansible-lint error (ansible.builtin.synchronize -> ansible.posix.synchronize) 2022-11-01 07:05:26 +02:00
ikkemaniac 8b425b995e add newline char 2022-10-31 23:44:47 +01:00
ikkemaniac 93615b6ad9 Revert "convert shell to command usage" to allow for a catching the specific "git: not found" error.
This reverts commit 45c9c2b17a.
2022-10-31 23:38:54 +01:00
ikkemaniac 45c9c2b17a convert shell to command usage 2022-10-31 23:08:45 +01:00
ikkemaniac 2b049da963 move when clause per linting suggestion 2022-10-31 23:00:04 +01:00
ikkemaniac 39e6484956 fix lints 2022-10-31 22:57:16 +01:00
Slavi Pantaleev e1274a6e56 Rename variable (matrix_hookshot_feeds_interval -> matrix_hookshot_feeds_pollIntervalSeconds)
This is more consistent with how we name variables. It's also less
confusing, especially given that we have `matrix_hookshot_feeds_pollTimeoutSeconds` as well.
2022-10-31 21:52:01 +02:00
Slavi Pantaleev ec45b87376 Add matrix_hookshot_feeds_pollTimeoutSeconds 2022-10-31 21:50:39 +02:00
Slavi Pantaleev 975dda54c9 Upgrade Dendrite (0.10.4 -> 0.10.5) 2022-10-31 21:34:14 +02:00
ikkemaniac 15fbc525cf Typo 2022-10-30 14:53:27 +01:00
ikkemaniac fd25cf8f54 Update wording 2022-10-30 14:45:20 +01:00
ikkemaniac 3d902b7fe7 be more specific on GIT not found error 2022-10-30 14:35:44 +01:00
ikkemaniac 930867d50d Remove matrix_vars_yml_snapshotting_enabled condition 2022-10-30 14:07:39 +01:00
ikkemaniac 230eea6784 Save git_hash.yml only on the target 2022-10-30 14:04:33 +01:00
ikkemaniac 678dfc6dc3 Rename var 2022-10-30 14:00:04 +01:00
Stefan Warnat ab398276af Always use resolver variable in nginx conf.d files 2022-10-30 00:55:36 +02:00
ikkemaniac 80e57417f4 To recover from a failure or allow to quickly reset to known state we need to know with what playbook-commit the sever is installed. This commit saves the GIT hash/status when we run the playbook in a file called git_hash.yml. It also backs up that file by copying it to the target machine. 2022-10-29 23:58:46 +02:00
Aine e25464409d
Update mautrix-signal 0.4.0 -> 0.4.1
ref: https://github.com/mautrix/signal/releases/tag/v0.4.1
2022-10-28 20:53:48 +00:00
Slavi Pantaleev 30180048c3 Upgrade Synapse (v1.69.0 -> v1.70.1) 2022-10-28 19:43:44 +03:00
Slavi Pantaleev 7fb45a507d Make --tags=run-postgres-vacuum and --tags=upgrade-postgres not assume Synapse
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2211
2022-10-28 17:40:12 +03:00
Sebastian Gumprich 48388a3d96 use fqcns for some task
Signed-off-by: Sebastian Gumprich <github@gumpri.ch>
2022-10-28 14:04:29 +02:00
Aine 3c31638de9
fix buscarron ban list 2022-10-27 10:45:08 +00:00
Aine 45226f3141
Update signald 0.22.2 -> 0.23.0
ref: https://gitlab.com/signald/signald/-/issues/343
2022-10-27 08:14:31 +00:00
Slavi Pantaleev 7303f9241c Fix yamllint error 2022-10-27 09:59:54 +03:00
Slavi Pantaleev 35c5c23a3e Remove useless tasks from matrix-postgres-backup role
`matrix-postgres-backup` reuses the `matrix-postgres` role for these
tasks, not its own definitions.
2022-10-27 06:51:31 +03:00
Slavi Pantaleev 6cacf7297d Add support for postgres-backup-local v15
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2200
2022-10-27 06:51:31 +03:00
Slavi Pantaleev e5e5ee4f72 Use fixed image tags for prodrigestivill/postgres-backup-local
At some point, we can drop v9.6 support and use a single variable
that holds this value.

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2191
2022-10-27 06:51:31 +03:00
Joe Kappus 170960be1a
update element v1.11.11 -> v1.11.12
fixes jitsi issue
2022-10-26 18:47:09 -04:00
Slavi Pantaleev 3694bf1d18
Merge pull request #2198 from etkecc/buscarron-130
update buscarron 1.2.1 -> 1.3.0
2022-10-25 22:05:22 +03:00
Slavi Pantaleev 06d4ca0f4e
Merge pull request #2197 from etkecc/postmoogle-098
update postmoogle 0.9.7 -> 0.9.8
2022-10-25 22:03:59 +03:00
Slavi Pantaleev 304906260b
Merge pull request #2196 from etkecc/honoroit-0916
update honoroit 0.9.15 -> 0.9.16
2022-10-25 22:03:20 +03:00
Aine 437d177d31
update element v1.11.10 -> v1.11.11 2022-10-25 18:17:47 +00:00
Aine 12fe1f417c
update buscarron 1.2.1 -> 1.3.0 2022-10-25 18:39:39 +03:00
Aine a22d5b1726
update postmoogle 0.9.7 -> 0.9.8 2022-10-25 18:26:57 +03:00
Aine 145a57a7b8
update honoroit 0.9.15 -> 0.9.16 2022-10-25 18:25:07 +03:00
Aine 81d8785811
Update grafana 9.2.1 -> 9.2.2 2022-10-25 13:03:50 +00:00
Aine fd7e1604a5
Update appservice-irc 0.35.1 -> 0.36.0 2022-10-25 09:16:24 +00:00
Slavi Pantaleev cb2fecbea9 Fix some ansible-lint-reported warnings 2022-10-25 06:43:57 +03:00
Slavi Pantaleev 9c549a185f Auto-purge orphaned Let's Encrypt renewal configuration files 2022-10-25 06:28:24 +03:00
Aine 24409766eb
Fix 502
ref: 57bb340343
2022-10-24 05:42:18 +00:00
Slavi Pantaleev 716efe7ad5 Upgrade ddclient (v3.9.1-ls100 -> v3.10.0-ls102) 2022-10-23 09:52:02 +03:00
Slavi Pantaleev 9fd3e00b71
Upgrade nginx (1.23.1 -> 1.23.2) 2022-10-23 07:45:54 +03:00
Slavi Pantaleev 57bb340343 Make ntfy not try to listen on a privileged port
We're starting it with `--user` and dropped capabilities, after all.

Hopefully fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2188
2022-10-22 08:45:59 +03:00
Slavi Pantaleev 4635968840 Upgrade Hookshot (2.3.0 -> 2.4.0) 2022-10-21 20:07:29 +03:00
Slavi Pantaleev 4cf85605a9 Upgrade Dendrite (0.10.3 -> 0.10.4) 2022-10-21 17:36:24 +03:00
Slavi Pantaleev ff0fc88fae Make Postgres import not break for databases with special names
We haven't encountered such a problem yet, but it doesn't hurt to
make things more robust.
2022-10-21 11:25:30 +03:00
Slavi Pantaleev 0b44ec19b4 Do not override matrix_postgres_import_roles_to_ignore/matrix_postgres_import_databases_to_ignore in group_vars
These values that we were setting also make sense in the context of the
`matrix-postgres` role even when not used within the playbook.
2022-10-21 10:01:22 +03:00
Slavi Pantaleev e37e86eb1c Fix 'could not save history to file "//.psql_history"' errors 2022-10-21 07:33:10 +03:00
Slavi Pantaleev bed9c18ab0 Pin Postgres version to 15.0
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2180

Just specifying `15` means we won't automatically re-pull `15.1` when it comes out.
2022-10-21 05:32:02 +03:00
Slavi Pantaleev b8097b0bd6 Add support for binary content to matrix-aux 2022-10-20 16:05:55 +03:00
Slavi Pantaleev af3a32cf6a Fix Jinja2 interpolation for some default variables
We're overriding these in the correct way in `group_vars/matrix_servers`
so this wasn't causing any problem in practice.
2022-10-20 15:46:02 +03:00
Slavi Pantaleev 490cce14ad Merge branch 'dnapier-master'
Closes https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2180
2022-10-20 07:43:32 +03:00
Slavi Pantaleev a32eea41fe Make roles/matrix-postgres/tasks/detect_existing_postgres_version.yml detect Postgres v14 2022-10-20 07:43:01 +03:00
Slavi Pantaleev 20db57d288 Upgrade certbot (v1.30.0 -> v1.31.0) 2022-10-20 07:40:45 +03:00
David Napier 2eef6af23e Bump postgres version to newly released 15 2022-10-19 10:45:11 -04:00
Aine bcba84389d
Update grafana 9.2.0 -> 9.2.1 2022-10-18 12:43:13 +00:00
Aine c781bdea99
Update Synapse 1.68.0 -> 1.69.0 2022-10-17 14:24:57 +00:00
Slavi Pantaleev 6480cc3629 Fix 'something' is undefined error in matrix-bridge-appservice-slack
.. when `matrix_nginx_proxy_enabled: false`

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2177
2022-10-17 08:04:06 +03:00
Slavi Pantaleev 476416a880
Merge pull request #2175 from smargold476/master
Add ability to sync only direct Chats in TG-Bridge
2022-10-16 18:28:22 +03:00
Slavi Pantaleev 07a7234ba0
Use | to_json 2022-10-16 18:27:35 +03:00
Slavi Pantaleev 4d267dad40 Upgrade mautrix-whatsapp (0.7.0 -> 0.7.1) and sync bridge config with upstream 2022-10-16 18:24:55 +03:00
smargold476 4751f84971
Merge pull request #2 from smargold476/patch-3
add option to change filter_mode
2022-10-15 14:41:36 +02:00
smargold476 a6e167cf91
add option to change filter_mode 2022-10-15 14:38:51 +02:00
smargold476 01078fea8f
add default for TG filter_mode 2022-10-15 14:37:09 +02:00
Slavi Pantaleev 30745db6d5 Add storage-class support to the s3_media_upload command and mention matrix-synapse-s3-storage-provider-migrate script 2022-10-14 18:29:30 +03:00
Slavi Pantaleev 6f56b9fb38 Upgrade Dendrite (0.10.2 -> 0.10.3) 2022-10-14 18:17:08 +03:00
Slavi Pantaleev de8fd519c5 Document matrix-synapse-s3-storage-provider-migrate.{service,timer} 2022-10-14 18:14:34 +03:00
Slavi Pantaleev 2e0fc5c11c Fix some ansible-lint-reported warnings 2022-10-14 18:04:49 +03:00
Slavi Pantaleev fe96475595 Remove some useless PG_ variables fron the s3-storage-provider env-file
These Postgres configuration variables are part of the `database.yaml` file
and don't need to be here.
2022-10-14 18:01:51 +03:00
Slavi Pantaleev a3759b0466 Announce Synapse customization and synapse-s3-storage-provider support 2022-10-14 17:50:48 +03:00
Slavi Pantaleev ac7cb3619d Add support for synapse-s3-storage-provider 2022-10-14 17:41:41 +03:00
Slavi Pantaleev 881fdd28f0 Add support for Synapse container image customization
This allows people to augment the Synapse image with custom tools and
addons without having to rebuild it from scratch.

If customizations are enabled, the playbook will build a new
`localhost/matrixdotorg/synapse:VERSION-customized` image
on top of the default one (`FROM matrixdotorg/synapse:VERSION`)
and with custom Dockerfile build steps.

For servers that self-build the Synapse image, the Synapse image will be
built first, before proceding to extend it the same way.

In the future, we'll also have easy to enable Dockerfile build steps
for modules that the playbook supports.
2022-10-14 16:37:54 +03:00
Slavi Pantaleev 0da068c7e6 Add support for configuring Synapse's media_storage_providers
In the future, we'll also inject media storage providers that we support
into the `matrix_synapse_media_storage_providers_auto` list.
2022-10-14 16:28:47 +03:00
Slavi Pantaleev 62215a87fe Upgrade Postgres minor versions (14.4 -> 14.5, 13.7 -> 13.8, etc.) 2022-10-14 16:25:57 +03:00
Aine 7c7b9d119f
Update postmoogle 0.9.6 -> 0.9.7
* fix room account data retrieving
2022-10-12 10:57:25 +00:00
Aine 43b1be9a3c
Update grafana 9.1.7 -> 9.2.0 2022-10-11 18:57:52 +00:00
Aine 3c669761ce
Update element 1.11.9 -> 1.11.10 2022-10-11 18:31:46 +00:00
Slavi Pantaleev a9100641f6
Merge pull request #2168 from etkecc/patch-96
Update postmoogle 0.9.5 -> 0.9.6
2022-10-11 19:57:22 +03:00
Aine fe8f91a9da
Update postmoogle 0.9.5 -> 0.9.6
* show recipient's email (header `TO`)
* add `norecipient` option
* add anti-spam options (`spamcheck:` and `spamlist:`)
* fix bugs
2022-10-11 14:30:55 +00:00
Aine 19f1c8ea5e
Update element 1.11.8 -> 1.11.9 2022-10-11 14:29:52 +00:00
Slavi Pantaleev da041bc60c Upgrade mautrix-instagram (0.2.1 -> latest)
We don't like updating to untagged releases, but..

0.2.1 has some regression and upstream is not releasing 0.2.2 or 0.3.0
just yet, so we either need to downgrade to 0.2.0 or go `latest`.

We can hopefully switch back to a tagged release soon.

Related to https://github.com/mautrix/instagram/issues/56
2022-10-11 09:41:12 +03:00
Slavi Pantaleev c886e4f48b
Merge pull request #2164 from etkecc/patch-93
Enable hookshot feeds by default
2022-10-11 09:15:44 +03:00
Aine 5ff03c0b15
Change hookshot logging level to warn
all other bridges use that level
2022-10-11 06:04:18 +00:00
Aine 9412140477
Enable hookshot feeds by default
as per documentation: "Services that need no further configuration are enabled by default" and feeds service doesn't require it
2022-10-11 06:00:49 +00:00
Slavi Pantaleev 81f90f0ad1
Use |to_json for matrix_mautrix_discord_bridge_restricted_rooms 2022-10-10 17:09:42 +03:00
Samuel Meenzen 1d024975d6 Automatically set restricted_rooms to false on conduit 2022-10-10 07:10:15 +00:00
Samuel Meenzen 7cc3aae041
fix(mautrix-discord): allow configuring the restricted_rooms option 2022-10-09 21:59:33 +02:00
Slavi Pantaleev e6ecd54e72 Suppress some ansible-lint errors 2022-10-09 20:42:20 +03:00
Slavi Pantaleev 1be8f8b0ba import_tasks -> ansible.builtin.import_tasks 2022-10-09 19:23:40 +03:00
Aine b17b1fb01a
Update jitsi stable-7830 -> stable-7882 2022-10-09 15:52:55 +00:00
Shaleen Jain af910db583 dendrite: update config 2022-10-08 03:36:40 +05:30
Slavi Pantaleev 9e0bfcc05e Upgrade Prometheus (2.39.0 -> 2.39.1) 2022-10-07 21:37:17 +03:00
Slavi Pantaleev 12d4e080fa Upgrade Dendrite (0.10.1 -> 0.10.2) 2022-10-07 21:36:44 +03:00
Aine 61a1d6a7bd
Update Postmoogle 0.9.4 -> 0.9.5 2022-10-06 23:08:58 +03:00
Slavi Pantaleev a12cbeac3b Fix async commands
Fixes a regression introduced in d1b5681ba0.

Looks like `.finished` is a property on the main object, not on some
`.async_result` object.
2022-10-06 19:48:11 +03:00
Slavi Pantaleev aff7ca2426 Upgrade appservice-slack (1.11.0 -> 2.0.1)
This also disables self-building on arm64, since it's no longer
necessary: https://github.com/matrix-org/matrix-appservice-slack/pull/656
2022-10-06 16:39:07 +03:00
Slavi Pantaleev 69b1b56691 Upgrade signald (0.21.1 -> 0.22.2) 2022-10-06 14:01:20 +03:00
Slavi Pantaleev d1b5681ba0 Report async task failures better
We were previously trying to reach into `.rc`,
but there's no such thing if `async_result.finished == 0`.

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2153
2022-10-06 10:04:37 +03:00
Aine 7872aa1611
Update hookshot 2.2.0 -> 2.3.0 2022-10-05 08:47:29 +00:00
Aine 9b1d0a9894
Update prometheus 2.38.0 -> 2.39.0 2022-10-05 06:42:02 +00:00
Aine 0a5cc4436b
Update grafana 9.1.6 -> 9.1.7 2022-10-04 13:41:11 +00:00
Warrows 5fd94466e1
Fix quote error introduced in 936412a08 2022-10-03 23:44:45 +02:00
Slavi Pantaleev 1631d55dff
Merge pull request #2143 from Warrows/maubot-nginx
Update proxied nginx for maubot
2022-10-03 16:24:45 +03:00
Warrows 936412a08e
Update proxied nginx for maubot
- Don't put unnecessary Host header.
- Update both cases (with or without nginx proxy)
2022-10-03 14:25:30 +02:00
Catalan Lover 2aceb445af
Fix config error that can cause Mjolnir to crash 2022-10-02 21:14:56 +02:00
Slavi Pantaleev 43e38170e5 Upgrade matrix-corporal (2.3.2 -> 2.4.0) 2022-10-02 16:47:55 +03:00
Slavi Pantaleev 033f188c1e Upgrade matrix-corporal (2.3.1 -> 2.3.2) 2022-10-02 11:10:32 +03:00
Slavi Pantaleev b67ba669e8
Merge pull request #2038 from TheOneWithTheBraid/braid/matrix-ldap-registration-proxy
Draft: feat: include matrix_ldap_registration_proxy
2022-10-02 09:23:25 +03:00
Slavi Pantaleev 81ee2449a8
Remove double ; 2022-10-02 09:18:54 +03:00
Slavi Pantaleev 2f48740525
Merge pull request #2141 from FSG-Cat/Mjolnir-CFG-Update
Update Mjolnir Config from its #962 state to todays template.
2022-10-01 14:21:14 +03:00
Darren Rambaud ec8daad805 dendrite: update image tag version
- update to v0.10.1 (https://github.com/matrix-org/dendrite/releases/tag/v0.10.1)
2022-09-30 12:08:18 -05:00
Darren Rambaud 851a52a532 dendrite: update tag image version
- update to 0.10.0 (https://github.com/matrix-org/dendrite/releases/tag/v0.10.0)
2022-09-30 08:35:26 -05:00
Warrows c650495c0e
Update proxied nginx for maubot 2022-09-30 11:50:43 +02:00
Slavi Pantaleev b51fe595b2 Upgrade matrix-corporal (2.3.0 -> 2.3.1) 2022-09-30 08:30:29 +03:00
Catalan Lover 59c46662e5
Start Updating Mjolnir CFG from Initial to Current 2022-09-29 20:25:56 +02:00
Julian-Samuel Gebühr 41e1da2ff4
Make registration proxy independent of other roles, document (#7)
* Make registration proxy independent of other roles, document

Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>

* Fix yml issues

Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>

* Remove undefined variable (as service HAS to be exposed

Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>

* Add registration endpint

Defines the registration endpoint that should be intercepted/forwarded to the proxy

Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>

* Add image name

Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>

Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>
2022-09-29 18:00:14 +02:00
Aine db7cc3bda0
Update Jitsi stable-7648-4 -> stable-7830 2022-09-29 10:53:35 +00:00
Slavi Pantaleev 5f0fbd6d62 Upgrade Cinny (2.2.1 -> 2.2.2) 2022-09-28 18:46:10 +03:00
Slavi Pantaleev 68c2e0bee5 Upgrade Element (v1.11.7 -> v1.11.8) 2022-09-28 18:43:50 +03:00
Slavi Pantaleev 01acd6ec3d Upgrade Cinny (2.2.0 -> 2.2.1) 2022-09-28 18:23:34 +03:00
Julian-Samuel Gebühr 38e19e48d2 Bump element version
This is a security relevant update
2022-09-28 15:59:47 +02:00
Slavi Pantaleev b6b56952a9
Merge pull request #2137 from etkecc/patch-87
Update Ntfy 1.27.2 -> 1.28.0
2022-09-27 22:49:26 +03:00
Aine 89ca2e5eda
Update Ntfy 1.27.2 -> 1.28.0 2022-09-27 19:47:05 +00:00
Aine f9e750c47f
Update Element 1.11.5 -> 1.11.6 2022-09-27 19:42:17 +00:00
Slavi Pantaleev de671ad58a Upgrade ddclient (v3.9.1-ls99 -> v3.9.1-ls100) 2022-09-27 15:37:24 +03:00
Slavi Pantaleev 5d5642abc5 Upgrade Synapse (v1.67.0 -> v1.68.0) 2022-09-27 15:35:40 +03:00
Slavi Pantaleev 1ea1597020 Fix some ansible-lint-reported warnings
This mostly fixes `key-order` warnings around
`block` statements.
2022-09-27 11:38:33 +03:00
Slavi Pantaleev 0ab5371ebd Upgrade mautrix-telegram (0.12.0 -> 0.12.1) and lottieconverter (alpine-3.15 -> alpine-3.16) 2022-09-27 08:55:27 +03:00
Aine 8e448aed0f
Update Prometheus Node Exporter 1.3.1 -> 1.4.0 2022-09-26 18:23:55 +00:00
Slavi Pantaleev 0499692661 Upgrade appservice-irc (0.35.0 -> 0.35.1) 2022-09-26 15:31:20 +03:00
Slavi Pantaleev f623cf3550 Only download Grafana dashboard URLs for enabled services
If someone is using Dendrite and enabling Grafana, we'll no longer
download Synapse dashboards.

If someone is not using node-exporter, we'll no longer download node
exporter dashboards.

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2133
2022-09-26 08:46:10 +03:00
Slavi Pantaleev 3f4bedb31e Use matrix_grafana_enabled: true in the matrix-grafana role
This is consistent with what all other roles do. If someone includes a
role, the assumption is that they want its functionality enabled.

The playbook distribution then disables components via
`group_vars/matrix_servers`. We've always had `matrix_grafana_enabled: false`
there, so flipping the in-role `_enabled` flag to `true` does not change
anything for playbook users. Users who import the roles individually in
their own other playbooks (and who don't use `group_vars/matrix_servers`)
may observe a change in the defaults with this.
2022-09-26 08:26:30 +03:00
Slavi Pantaleev 6c928d87ca Configure Grafana's default_home_dashboard_path properly
Using `matrix_synapse_*` variables within the `matrix-grafana` role
is not a good practice.

We now have a `matrix_grafana_default_home_dashboard_path` variable
with a good universal default value and we override it via
`group_vars/matrix_servers` based on enabled components, etc.

This is a better fix for https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2133
2022-09-26 08:23:54 +03:00
Slavi Pantaleev 14af09e4f3 Define matrix_grafana_dashboard_download_urls_all variable in matrix-grafana role
We shouldn't be using it in the role (`tasks/setup.yml`) without
defining at least some default value in the role itself.

We've always had the override in `group_vars/matrix_servers`,
so the variable was essentially defined (at the playbook level), but
that's not the right way to do things.
2022-09-26 08:08:47 +03:00
Slavi Pantaleev a69613a2e7
Merge pull request #2132 from mjarr/mjarr-patch-1
synapse: match upstream rate limit defaults
2022-09-24 22:46:32 +03:00
mjarr dd8106790e
synapse: match upstream rate limit defaults 2022-09-24 18:53:56 +02:00
Aine 484536b039
Do not restart postmoogle during installation
Reason: during a fresh install, when there is no synapse yet, systemd unit fails to start, thus whole play fails
2022-09-24 16:01:27 +00:00
Shaleen Jain b77907f2d4
whatsapp: do not turn on synapse only options 2022-09-24 09:45:26 +05:30
Aine fc56288f5b
Update Postmoogle 0.9.3 -> 0.9.4
* send emails in UTF-8 👋
* fix options descriptions
* add SMTP auth
* allow sending emails from your apps and scripts using postmoogle as email provider
2022-09-23 08:34:58 +00:00
Darren Rambaud 59adb8d028 dendrite: update image tag version
- 0.9.9 (https://github.com/matrix-org/dendrite/releases/tag/v0.9.9)
2022-09-22 09:21:23 -05:00
Slavi Pantaleev bcb6679e31
Merge pull request #2124 from etkecc/patch-82
Update Postmoogle 0.9.2 -> 0.9.3
2022-09-21 12:39:05 +03:00
Aine 6d29048ed9
Update Postmoogle 0.9.2 -> 0.9.3 2022-09-21 08:20:21 +00:00
Aine 8717447dc5
Update Honoroit 0.9.14 -> 0.9.15 2022-09-21 08:08:30 +00:00
Aine c6f9a42f40
Update Grafana 9.1.5 -> 9.1.6 2022-09-20 14:58:45 +00:00
Slavi Pantaleev 916df397d9
Merge pull request #2120 from etkecc/patch-78
Update ddclient v3.9.1-ls98 -> v3.9.1-ls99
2022-09-20 12:13:46 +03:00
Aine 63423e614f
Update ddclient v3.9.1-ls98 -> v3.9.1-ls99 2022-09-20 09:09:27 +00:00
Aine 18836e910f
Update mautrix-instagram 0.2.0 -> 0.2.1 2022-09-20 09:03:22 +00:00
Slavi Pantaleev 89648cf58e Fix some ansible-lint-reported warnings 2022-09-18 12:21:09 +03:00
Slavi Pantaleev 0259a7a50b Fix typo
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2114
2022-09-18 12:03:54 +03:00
Slavi Pantaleev 9654f5b5e3
Merge pull request #2113 from etkecc/honoroit-0914
Update Honoroit 0.9.13 -> 0.9.14
2022-09-18 09:41:26 +03:00
Aine f042542086
Update Honoroit 0.9.13 -> 0.9.14 2022-09-17 23:51:05 +03:00
Aine 47fa90bdc3
Update mautrix-signal 0.3.0 -> 0.4.0 2022-09-17 20:38:07 +00:00
Shaleen Jain 435c4f8b01
dendrite: update config to match upstream defaults 2022-09-17 14:33:29 +00:00
Slavi Pantaleev 67763fadec
Merge pull request #2109 from borisrunakov/stream_writer_worker_metrics_range
change stream writer worker metrics range start
2022-09-17 17:09:08 +03:00
Aine 3a3a0b5c9a
Update Cinny 2.1.3 -> 2.2.0 2022-09-17 13:41:29 +00:00
borisrunakov 49c64a8d65 change stream writer worker metrics range start 2022-09-17 10:22:05 +03:00
Slavi Pantaleev f2b66c3b04 Use a different name for appservice-irc image (localhost/ prefix) if self-building enabled
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2108
2022-09-17 10:02:07 +03:00
Slavi Pantaleev b45cd7495c Upgrade mautrix-whatsapp (0.6.1 -> 0.7.0) and change some defaults
`ephemeral_events`` and `sync_with_custom_puppets` have been flipped
to keep up with the default upstream config:
b33bd9c4a7
2022-09-17 09:39:42 +03:00
Slavi Pantaleev e25678c57a Upgrade Hookshot (2.1.2 -> 2.2.0) 2022-09-17 09:23:09 +03:00
Julian-Samuel Gebühr cd21525b4b Merge branch 'braid/matrix-ldap-registration-proxy' of https://github.com/TheOneWithTheBraid/matrix-docker-ansible-deploy into matrix-ldap-registration-proxy 2022-09-16 19:40:00 +02:00
Julian-Samuel Gebühr d23cef541e Redo exposing the service to nginx
The Service is now exposed by default on port 8585 and forwarded by nginx to the specified endpoint

Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>
2022-09-16 19:16:45 +02:00
Slavi Pantaleev b07fd76830 Fix prometheus.yml.j2 indentation and worker ids for stream writers
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2105
2022-09-15 12:46:44 +03:00
Slavi Pantaleev 800267b182 Fix incorrect if checks breaking start_pushers/send_federaiton/enable_media_repo
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2103
2022-09-15 12:33:23 +03:00
Slavi Pantaleev ef112181a1 Update some Synapse documentation URLs 2022-09-15 10:46:17 +03:00
Slavi Pantaleev 109e1addb8 Improve reliability when using more than 1 media_repository worker 2022-09-15 10:45:03 +03:00
Slavi Pantaleev 8887aed500 Do not add federation_sender_instances/pusher_instances configuration if not necessary
This keeps the configuration cleaner and hopefully prevents odd issues
if Synapse (by any chance) happens to interpret `pusher_instances: []`
as "no pushers", instead of as "push from the master process".

I haven't confirmed what an empty pushers/federation-senders list means,
so it's safer to just avoid it.
2022-09-15 10:34:02 +03:00
Slavi Pantaleev a1fb082618 Add support for running background tasks on a worker 2022-09-15 10:32:51 +03:00
Slavi Pantaleev 5f3f460cda Restore support for appservice and user_dir workers 2022-09-15 10:06:56 +03:00
Slavi Pantaleev 8cd7c1ec2f Relocate enable_media_repo and make it configurable via matrix_synapse_enable_media_repo
.. although.. manual configuration is discouraged in most cases.
2022-09-15 08:37:23 +03:00
Slavi Pantaleev b842447047 Add support for multiple pusher workers 2022-09-15 08:32:55 +03:00
Slavi Pantaleev 22cf259155 Put common worker configuration options at the top 2022-09-15 08:14:47 +03:00
Slavi Pantaleev ec654ca91e Add support for multiple federation sender workers 2022-09-15 08:13:08 +03:00
Slavi Pantaleev 226c550ffa Add support for stream writer Synapse workers
As stream writer workers are also powered by the `generic_worker`
Synapse app, this necessitated that we provide means for distinguishing
between them and regular `generic_workers`.

I've also taken the time to optimize nginx configuration generation
(more Jinja2 macro usage, less duplication).

Worker names have also changed.
Workers are now named sequentially like this:
- `matrix-synapse-worker-0-generic`
- `matrix-synapse-worker-1-stream-writer-typing`
- `matrix-synapse-worker-2-pusher`

instead of `matrix-synapse-worker_generic_worker-18111` (indexed with a
port number).

People who modify `matrix_synapse_workers_enabled_list` directly will
need to adjust their configuration.
2022-09-15 08:10:04 +03:00
Slavi Pantaleev fde5fef8b3 Fix Cactus Comments nginx injection when matrix-nginx-proxy disabled
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2101

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2089
2022-09-14 20:44:35 +03:00
Aine cb2e57e33a
Update Postmoogle 0.9.1 -> 0.9.2 2022-09-14 09:58:33 +00:00
Slavi Pantaleev ef523d68a4 Suppress errors in docker kill/rm calls for Synapse workers
We do the same everywhere else. This is an omission.
2022-09-14 08:13:01 +03:00
Julian-Samuel Gebühr 54d5741ec1 Fix typo 2022-09-13 16:39:15 +00:00