Commit graph

961 commits

Author SHA1 Message Date
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
Array in a Matrix 3505f62f02
Update configuring-playbook-telemetry.md 2022-11-22 11:37:46 -05:00
Array in a Matrix 6c39413e79
Update configuring-playbook-telemetry.md 2022-11-22 11:32:03 -05:00
Array in a Matrix 26c219e1cc
Update configuring-playbook-telemetry.md 2022-11-22 11:30:19 -05:00
Slavi Pantaleev 2ad6bd87c7 Determine matrix_architecture automatically 2022-11-22 09:22:56 +02:00
Slavi Pantaleev d8f2141eb0 Install Docker via geerlingguy.docker Galaxy role 2022-11-22 09:01:26 +02:00
Slavi Pantaleev 377e703746 Fixup Traefik example configuration
Related to e9e84341a9
2022-11-20 18:01:44 +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
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
Slavi Pantaleev 494d015e82
Merge pull request #2250 from felixx9/patch-4
add how to integrate
2022-11-16 11:56:34 +02:00
Slavi Pantaleev 9c2dedfdeb
Reorganize a bit 2022-11-16 11:56:22 +02:00
Slavi Pantaleev 40e8ef0c70 Do not tell people to use latest Borgmatic - it won't help with Postgres v15
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2259#issuecomment-1312737960
2022-11-16 11:50:05 +02:00
throny f5a09f30b7
Update maintenance-postgres.md 2022-11-12 23:48:57 +01:00
throny b12cdbd99d
Update maintenance-postgres.md 2022-11-12 23:40:46 +01:00
throny adbc09f152
warn users about upgrading to pg15 when using borg 2022-11-12 11:20:43 +01:00
felixx9 98d2df5fcf
more details,
hopefully better understandable wording. To write docs I need to learn a new language (feels like it)
2022-11-12 00:31:39 +01:00
felixx9 707fb564de
add how to integrate
describe, how to integrate a pad
2022-11-09 12:49:20 +01:00
Slavi Pantaleev fa11d5af2b
Merge pull request #2222 from array-in-a-matrix/master
Document login to Discord using token
2022-11-09 09:10:04 +02:00
Slavi Pantaleev 06df2df9e9 Mention playbook ownership issues when running Ansible in a container and potential workarounds
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2248
2022-11-09 09:01:58 +02:00
Slavi Pantaleev 32e5c814e4 Update containerized Ansible tag and make documentation about "make roles" clearer
`devture/ansible:2.13.6-r0` contains the `make` utility.
(8597fd8272)

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2248
2022-11-09 08:46:49 +02:00
Abílio Costa a93d733bd3
Remove repeated quote in mautrix-discord docs 2022-11-06 21:38:27 +00: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 06eb186729
add matrix_etherpad_mode 2022-11-05 09:17:47 +02:00
Slavi Pantaleev 7289992dba Document make roles some more
Improves:

- https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2232
- https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2217#issuecomment-1304366791
2022-11-05 07:10:04 +02:00
Aine 9b97957022
Merge branch 'master' into make-etherpad-great-again 2022-11-04 17:36:15 +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 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
array-in-a-matrix fe360d7f99 added missing comma 2022-11-01 11:08:10 -04:00
Slavi Pantaleev eaa9b7cfc4 Add automatic user account creation support to Buscarron
Continuation of c3dc64b1d5
2022-11-01 17:03:53 +02:00
array-in-a-matrix 34873da3fd moved login instructions to useage 2022-11-01 10:58:05 -04: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
array-in-a-matrix 96b923e3aa typo 2022-10-31 14:19:20 -04:00
array-in-a-matrix 8338f750e0 document login to discord with token 2022-10-31 14:13:11 -04:00
Slavi Pantaleev 54e71f2012 Mention "matrix_hookshot_enabled: true" on the Hookshot documentation page 2022-10-31 12:38:43 +02:00
Slavi Pantaleev ce8e9be6a8 Document Conduit installation
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2076
2022-10-27 09:56:16 +03:00
Array in a Matrix 9a439f91ae
update way to login to discord 2022-10-26 12:58:09 -04:00
Aine 12fe1f417c
update buscarron 1.2.1 -> 1.3.0 2022-10-25 18:39:39 +03:00
Slavi Pantaleev e2a5497332
Merge pull request #2189 from moan0s/backup
Add information on how to manually run the backup
2022-10-22 08:51:54 +03:00
Julian-Samuel Gebühr 3bd0af76dd Add information on how to manually run the backup
Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>
2022-10-22 07:47:00 +02:00
Slavi Pantaleev 782407cf89
Merge pull request #2186 from smargold476/patch-5
update remote-repo-infos with link to doc
2022-10-22 06:20:21 +03:00
smargold476 ac8312d95f
update link to example
in my environment i see the matrix. conf in that file: /matrix/nginx-proxy/conf.d/matrix-domain.conf
2022-10-21 22:19:03 +02:00
smargold476 7d043489bd
update remote-repo-infos with link to doc
was a litte confusing for me, so i added the link to the syntax-descr.
2022-10-21 21:51:54 +02:00
Slavi Pantaleev 7e8184e210 Do not break the guided installation flow 2022-10-21 14:58:21 +03:00
Array in a Matrix 0a022db256
grammar correction
the word "both" would refer to only 2 urls in this context
2022-10-21 00:52:48 -04:00
Slavi Pantaleev 80da7dfb0b Update docs/prerequisites.md 2022-10-20 11:48:56 +03:00
array-in-a-matrix c4a57428a6 add if hostname is not availble for SRV record 2022-10-20 00:34:30 -04:00
Slavi Pantaleev 3d215e18e8
Merge pull request #2176 from Zocker1999NET/patch-1
docs/configuring-playbook: Add link to etherpad configuration
2022-10-16 18:44:27 +03:00
Felix Stupp a7dc9a406d
docs/configuring-playbook: Add link to etherpad configuration 2022-10-15 20:17:58 +00:00
smargold476 7b3b22ce07
update docs to exclude grou-sync 2022-10-15 14:43:25 +02:00
Slavi Pantaleev 5a7b80d9e4 Update configuring-playbook-synapse-s3-storage-provider.md 2022-10-14 18:31:17 +03: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 de8fd519c5 Document matrix-synapse-s3-storage-provider-migrate.{service,timer} 2022-10-14 18:14:34 +03:00
Slavi Pantaleev 3cf0dcda6d Update "b2 sync" commands 2022-10-14 18:07:10 +03:00
Slavi Pantaleev 63a0e5c4f6 Add warnings to synapse-s3-storage-provider support feature 2022-10-14 17:58:47 +03:00
Slavi Pantaleev ac7cb3619d Add support for synapse-s3-storage-provider 2022-10-14 17:41:41 +03:00
Slavi Pantaleev 337016da28 Improve S3 docs a bit
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1869
2022-10-14 09:27:50 +03:00
Slavi Pantaleev 3b965fa8f5
Merge pull request #2162 from fdarveau/update-docs
Update Caddy examples and outdated Jitsi docker env variable/documentation link
2022-10-12 16:21:56 +03:00
François Darveau 35e80b7087
Update docs/configuring-playbook-own-webserver.md
Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2022-10-12 09:15:03 -04:00
François Darveau 21bed90e13 remove mention of other docker host in external webserver documentation (binding ports section) 2022-10-11 07:26:29 -04:00
Slavi Pantaleev 8311c59a8f Add Usage section to Hookshot docs 2022-10-11 10:43:01 +03:00
François Darveau 3a1847e193 moved bind port variables documentation for webserver on different docker network or host in a more generic section 2022-10-10 16:25:17 -04:00
François Darveau 9c52a8b3a1 update Jitsi on LAN configuration doc 2022-10-10 16:05:40 -04:00
Slavi Pantaleev e9993856a6 Fix typo 2022-10-06 13:23:48 +03:00
Slavi Pantaleev 8d40ddd654 Adjust importing-postgres docs to mention postgres_default_import_database 2022-10-06 13:22:52 +03:00
Slavi Pantaleev f4804f475a Announce matrix-ldap-registration-proxy
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2038
2022-10-02 09:27:51 +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
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
Warrows 202f54f327
Improve maubot doc
Add two important informations:
- The `mbc` commands must be ran in the docker container
- Not using this method prevent from using encrypted rooms with the bot
2022-09-22 13:48:24 +02:00
Mecallie 139be48706
Updated the Element settings. 2022-09-19 21:04:02 +02: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 2fa0ddcf53 TODO: Check if ths documentation is correct
Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>
2022-09-16 19:25:00 +02:00
Julian-Samuel Gebühr db705aff4f Add documentation to readme/list of services
Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>
2022-09-16 19:15:33 +02:00
Slavi Pantaleev e87bee15dd Add note about the Kakaotalk bridge being dangerous to use 2022-09-16 19:57:52 +03:00
Julian-Samuel Gebühr 0a4ce46e1e Add doc page
Signed-off-by: Julian-Samuel Gebühr <julian-samuel@gebuehr.net>
2022-09-16 18:25:36 +02: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 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 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
Slavi Pantaleev 98b9e2cd84 Add "Component" column to optional-DNS-records table 2022-09-09 14:36:53 +03:00
Aine 692a7af36a
postmoogle feedback 2022-09-09 13:19:25 +03:00
Aine b92ff748e4
Update Postmoogle 0.9.0 -> 0.9.1 2022-09-09 10:47:00 +03:00
Kolja Lampe ee2badf7a6
Correctly refer to the placeholder 2022-09-05 11:01:31 +02:00
Array in a Matrix 8a469adbfb
better wording 2022-08-29 14:33:53 -04:00
Array in a Matrix 5d7260a93d
removed server wide rate limit link 2022-08-29 14:30:00 -04:00
Array in a Matrix 76953d8a69
Update configuring-playbook-bot-mjolnir.md 2022-08-29 13:10:53 -04:00
Array in a Matrix aa92696613
Update configuring-playbook-bot-mjolnir.md 2022-08-29 13:10:29 -04:00
Array in a Matrix 071424bef2
Update configuring-playbook-bot-mjolnir.md 2022-08-29 02:29:57 -04:00
Slavi Pantaleev eaf13264e6 Announce Postmoogle email bridge bot
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2043
2022-08-23 14:16:10 +03:00
Slavi Pantaleev 447b9313d7
Merge pull request #2043 from etkecc/add-postmoogle
add postmoogle
2022-08-23 13:58:39 +03:00
Aine b3688cce71
Update docs/configuring-playbook-bot-postmoogle.md
Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2022-08-23 10:31:11 +00:00
Aine 1338a3c9fc
postmoogle: adjust help, add maxsize 2022-08-22 20:23:39 +03:00
Aine 9c2a8addee
add postmoogle 2022-08-22 20:10:35 +03:00