Commit graph

5087 commits

Author SHA1 Message Date
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 99f4f5edc7 Add note that disabling matrix-nginx-proxy may be a bad idea sometimes
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2090
2022-09-15 07:46:17 +03:00
Slavi Pantaleev 05819056bc Document that using Synapse workers with not-matrix-nginx-proxy causes troubles
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2090
2022-09-14 20:54:00 +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
Slavi Pantaleev 2763b9b854
Merge pull request #2102 from spantaleev/dependabot/github_actions/frenck/action-yamllint-1.3.0
Bump frenck/action-yamllint from 1.2.0 to 1.3.0
2022-09-14 20:23:27 +03:00
dependabot[bot] a7067b054d
Bump frenck/action-yamllint from 1.2.0 to 1.3.0
Bumps [frenck/action-yamllint](https://github.com/frenck/action-yamllint) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/frenck/action-yamllint/releases)
- [Commits](https://github.com/frenck/action-yamllint/compare/v1.2.0...v1.3.0)

---
updated-dependencies:
- dependency-name: frenck/action-yamllint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-14 17:19:47 +00:00
Slavi Pantaleev 1c220c8c7f
Merge pull request #2100 from etkecc/patch-74
Update Postmoogle 0.9.1 -> 0.9.2
2022-09-14 20:15:15 +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
TheOneWithTheBraid 1da77f03b1 fix: updated default variables
Signed-off-by: TheOneWithTheBraid <the-one@with-the-braid.cf>
2022-09-13 16:39:15 +00:00
Julian-Samuel Gebühr d33a668e65 Add role to setup.yml 2022-09-13 16:39:15 +00:00
Julian-Samuel Gebühr 19e61b0ad7 Inject nginx configuration for ldap proxy at runtime 2022-09-13 16:39:15 +00:00
Julian-Samuel Gebühr 94c9312bd0 Remove matrix LDAP proxy config from nginx role 2022-09-13 16:39:15 +00:00
Julian-Samuel Gebühr a03b5efc42 Add nginx rewrite for registration 2022-09-13 16:39:15 +00:00
Julian-Samuel Gebühr 7c79f78d03 Remove selfcheck 2022-09-13 16:39:15 +00:00
Julian-Samuel Gebühr bdfd84e146 Use a template option for the env with variable extension 2022-09-13 16:39:15 +00:00
Julian-Samuel Gebühr b4fdc622fd Remove ma1sd leftovers 2022-09-13 16:39:15 +00:00
Julian-Samuel Gebühr b6fee92f0e Avoid cross-referencing of variables in role, move to group vars 2022-09-13 16:39:15 +00:00
Julian-Samuel Gebühr 42230b6765 Make role enabled in role but turn it off in group vars 2022-09-13 16:39:15 +00:00
Julian-Samuel Gebühr 91e75d650e Validate that basic LDAP settings are provided 2022-09-13 16:39:15 +00:00
Julian-Samuel Gebühr 8e76d712df Remove ma1sd leftovers 2022-09-13 16:39:15 +00:00
TheOneWithTheBraid 6f02a916ec feat: include matrix_ldap_registration_proxy
Fixes: #1144

Signed-off-by: TheOneWithTheBraid <the-one@with-the-braid.cf>
2022-09-13 16:39:15 +00:00
Slavi Pantaleev bab0d3b2cf
Merge pull request #2098 from etkecc/patch-72
Update Appservice IRC 0.34.0 -> 0.35.0
2022-09-13 17:17:29 +03:00
Slavi Pantaleev 8a95e961de
Merge pull request #2095 from etkecc/patch-69
Update Grafana 9.1.4 -> 9.1.5
2022-09-13 17:17:15 +03:00
Slavi Pantaleev ca984a9987
Merge pull request #2096 from etkecc/patch-70
Update Element 1.11.4 -> 1.11.5
2022-09-13 17:17:08 +03:00
Slavi Pantaleev c5c032ac61
Merge pull request #2097 from etkecc/patch-71
Update Coturn 4.5.2-r14 -> 4.6.0-r0
2022-09-13 17:17:01 +03:00
Slavi Pantaleev ffbb231239
Merge pull request #2099 from etkecc/patch-73
Update Dendrite 0.9.7 -> 0.9.8
2022-09-13 17:16:49 +03:00
Aine 17e6c52cbf
Update Dendrite 0.9.7 -> 0.9.8 2022-09-13 13:53:45 +00:00
Aine 2edd9a056e
Update Appservice IRC 0.34.0 -> 0.35.0 2022-09-13 13:52:36 +00:00
Aine 83482721f8
Update Coturn 4.5.2-r14 -> 4.6.0-r0 2022-09-13 13:51:32 +00:00
Aine c29a39a6fb
Update Element 1.11.4 -> 1.11.5 2022-09-13 13:49:39 +00:00
Aine afe5a016cb
Update Grafana 9.1.4 -> 9.1.5 2022-09-13 13:48:57 +00:00
Slavi Pantaleev f12206676f Upgrade Synapse (v1.66.0 -> 1.67.0) and remove frontend_proxy workers
`frontend_proxy` workers have been superseded by `generic_worker` workers.
Related to https://github.com/matrix-org/synapse/pull/13645
2022-09-13 15:45:50 +03:00
Slavi Pantaleev 11f2cda21a Upgrade Certbot (1.28 -> 1.30) 2022-09-09 21:06:17 +03:00
Slavi Pantaleev 8778c14fe2 Upgrade Dendrite (0.9.6 -> 0.9.7) 2022-09-09 21:04:07 +03:00
Slavi Pantaleev a936c0ffcc
Merge pull request #2093 from etkecc/patch-68
Update Grafana 9.1.3 -> 9.1.4
2022-09-09 18:58:08 +03:00
Aine 5c954b0d5a
Update Grafana 9.1.3 -> 9.1.4 2022-09-09 15:55:53 +00:00
Julian-Samuel Gebühr c7d8299398 Correct service name
Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>
2022-09-09 16:01:36 +02:00
Slavi Pantaleev d6bd39c79d Add missing quotes
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2089
2022-09-09 15:18:57 +03:00
Slavi Pantaleev b510848c6d Mention that bot.cactusbot is created automatically
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2089
2022-09-09 15:13:35 +03:00
Slavi Pantaleev 5cfb0fb477 Update Email2Matrix docs page 2022-09-09 15:06:12 +03:00
Slavi Pantaleev a4d8a4094b Put "Component" column first in the optional-DNS configuration table
Related to 98b9e2cd84
2022-09-09 15:04:14 +03:00
Slavi Pantaleev 71555341d1 Pin Cactus Comments version (latest -> 0.9.0)
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2089
2022-09-09 14:49:51 +03:00
Slavi Pantaleev c00a8d4099 Announce Cactus Comments support
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2089
2022-09-09 14:47:53 +03:00
Slavi Pantaleev d2dc9149a9 Fix YAML block (ỳaml -> yaml)
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2089
2022-09-09 14:43:52 +03:00
Julian-Samuel Gebühr 5825a0c919
Cactus comments (#2089)
* Add construct for cactus comments role

* Adjust config files

* Add docker self build to defaults

* Adjust tasks

* Fix smaller syntax errors

* Fix env argument

* Add tmp path to allow container writing there

Background why I did this: https://docs.gunicorn.org/en/stable/settings.html#worker-tmp-dir

* Change port back to 5000 as not configurable in container

* Try to add appservice config file for synapse to use

* Inject appservice file

* Correct copied variable name

* Comment out unused app service file injection

would need mounting the appservice file to the synapse container i guess

* Move role before synapse to be able to inject during runtime

* Remove unused parts

* Change default user id to mirror official docs

* Add docs

* Update roles/matrix-cactus-comments/tasks/setup_install.yml

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

* Update roles/matrix-cactus-comments/templates/cactus_appservice.yaml.j2

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

* Generate secrets if necessary, adjust docs

* Rename cactusbot userid

* Shorten salt strings

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

* Use tmpfs instead of persistent mount

* Remove proxy option as it is nonsense

* Add download and serving of cc-client files

* Add documentation on client

* Clarify docs a bit

* Add nginx proxy to required services

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

* Use container address

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

* Correct comment of user id

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

* Use releases or local distributed client

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

* Move homeserver url to defaults

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

* Correct truth value

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

* Add documentation of variables

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

* Tabs vs. spaces

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

* Make nginx root configurable

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

* Complete ake nginx root configurable

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

* Fix file permission

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

* Fix lint errors

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

Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>
Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2022-09-09 14:37:52 +03:00