Commit graph

2280 commits

Author SHA1 Message Date
Slavi Pantaleev 965890bf75 Derive secrets from matrix_homeserver_generic_secret_key, not matrix_synapse_macaroon_secret_key
We're trying to move away from implementation-specific variables,
hoping for a clean (implementation-neutral) examples/vars.yml file.
2022-01-07 16:00:42 +02:00
Slavi Pantaleev 1dfe21944f Make matrix_homeserver_implementation influence matrix_IMPLEMENTATION_enabled, not the other way around
Doing this seems more reasonable and simpler.
2022-01-07 15:59:35 +02:00
Slavi Pantaleev 4139290cc9 Rename some variables for consistency 2022-01-07 15:59:35 +02:00
Slavi Pantaleev 2bd33e5cf2 Make --tags=register-user work for both Dendrite/Synapse
Also get rid of `--tags=update-user-password` in the
`matrix-dendrite` role, as what we had doesn't work.

We may be able to do it with some Ansible helper or something else.
For now, we'll omit this feature.
2022-01-07 15:59:35 +02:00
Slavi Pantaleev f8a8d7d310 Fix /usr/local/bin/matrix-dendrite-create-account
We also need to fix `--tags=register-user`. This tag is currently
defined in both the `matrix-synapse` and `matrix-dendrite` roles.
2022-01-07 15:59:35 +02:00
Slavi Pantaleev b297e8ee2b Delay Dendrite startup so that matrix-postgres.service can start 2022-01-07 15:59:35 +02:00
Slavi Pantaleev 9f6e8f5eaf Remove matrix_s3 references from matrix-dendrite role
All the `matrix_s3_*` stuff happens in the `matrix-synapse` role.

If we are to have such S3 support for Dendrite, we should probably
extract it out of the `matrix-synapse` role (into a `matrix-s3` role or
`matrix-goofys`, etc.) and wire `matrix-dendrite` accordingly.

This may or may not be done in the future though. For now, I'm
cleaning things up in the `matrix-dendrite` role.
2022-01-07 15:59:35 +02:00
Slavi Pantaleev 3b9d5b13e9 Add support for not serving Dendrite federation APIs on the client port
Seems like Dendrite encourages serving both the Client and Federation
API at the same port.

Coming from Synapse and how things are done there, we have separate
ports. Using separate ports probably makes matrix-corporal (etc.)
integration easier, so separating the APIs by default probably makes
sense.
2022-01-07 15:59:35 +02:00
Slavi Pantaleev ecc237bbad Initial work on getting nginx reverse proxying working with Dendrite 2022-01-07 15:59:35 +02:00
Slavi Pantaleev 2f57c51733 Remove useless check
Since 025a5ab5e5f6bdb3, we do a similar check in matrix-base.
2022-01-07 15:59:35 +02:00
Slavi Pantaleev 3cf9f87097 Add matrix_homeserver_implementation, tracking the current homeserver implementation
The goal is to have a single variable which tells us which homeserver
software is in use. Much simpler than having if/elif/elif checks for
variables like (`matrix_synapse_enabled` and `matrix_dendrite_enabled`, etc.)
everywhere.
2022-01-07 15:59:35 +02:00
Slavi Pantaleev 63968cb04f Upgrade Dendrite (0.5.0 -> 0.5.1) 2022-01-07 15:59:35 +02:00
Slavi Pantaleev b2b62b7221 Add a variable to control Dendrite's disable_federation setting 2022-01-07 15:59:35 +02:00
Slavi Pantaleev 5b148921a0 Upgrade Dendrite (0.3.11 -> 0.5.0) and update configuration
This brings dendrite.yaml up to date and cleans things up a bit.
2022-01-07 15:59:35 +02:00
Slavi Pantaleev ccd3dc7a57 Remove Dendrite file logging
We refrain from logging to files for all components,
because we rely on systemd-journald anyway.
2022-01-07 15:59:35 +02:00
Jip J. Dekker 953a9ac718 Upgrade Dendrite (0.3.9 -> 0.3.11) 2022-01-07 15:59:35 +02:00
Jip J. Dekker cde2504966 Upgrade Dendrite (0.3.8 -> 0.3.9) 2022-01-07 15:59:35 +02:00
Aaron Raimist 265d048597 Upgrade Dendrite (0.3.6 -> 0.3.8) 2022-01-07 15:59:35 +02:00
Aaron Raimist fc62537fcf Remove Synapse and Goofys stuff 2022-01-07 15:59:35 +02:00
Jip J. Dekker 07af05690c Add initial role for Dendrite as alternative Matrix server 2022-01-07 15:59:35 +02:00
rakshazi 2836667df2
self-build consistency: missing var 2022-01-07 13:21:41 +02:00
rakshazi c191bf54ca
self-build consistency: add deprecation warnings 2022-01-07 13:17:39 +02:00
rakshazi d9dd524db3
self-build consistency: rename vars everywhere 2022-01-07 12:18:45 +02:00
Slavi Pantaleev b0c801a497 Rename variable for consistency (matrix_bot_honoroit_container_self_build -> matrix_bot_honoroit_container_image_self_build)
Discussed in https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1514
2022-01-07 11:53:24 +02:00
rakshazi d66c812830
matrix-bot-honoroit: fix self-build 2022-01-07 09:06:25 +00:00
rakshazi d7af37e9e9
matrix-bot-honoroit feedback 2022-01-07 09:41:52 +02:00
rakshazi 407e8c4940
added honoroit 2022-01-06 20:30:10 +02:00
Slavi Pantaleev 7dfb68b7f8 Add else statements to inline ifs
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1509
2022-01-06 11:05:02 +02:00
rakshazi 490f11ba0d
matrix-client-cinny: self_build feedback" 2022-01-06 09:11:28 +02:00
rakshazi 5788a16a2e
added matrix-client-cinny 2022-01-05 18:33:21 +02:00
Slavi Pantaleev b1b4ba501f Replace ExecStop with ExecStopPost
ExecStopPost should allow us to clean up (docker kill + docker rm)
even if the ExecStart (docker run ..) command failed, and not just after
a graceful service stop was initiated.

Source: https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStopPost=
2022-01-04 17:27:25 +02:00
Slavi Pantaleev 8515ac55e6 Upgrade nginx (1.21.4 -> 1.21.5) 2022-01-04 17:04:01 +02:00
Slavi Pantaleev b3a9160e0f
Merge pull request #1497 from jimeh/etherpad-add-optional-admin-access
feat(etherpad): add optional admin web-UI access
2022-01-04 09:20:39 +02:00
Slavi Pantaleev f0d7a8e99d
Use to_json 2022-01-04 09:18:31 +02:00
Slavi Pantaleev 3295eb15bf
Merge pull request #1500 from cnvandijk/deprecated-jitsi-interface-config
Remove Jitsi web interface_config.js in favour of custom-interface_config.js
2022-01-04 08:50:42 +02:00
Slavi Pantaleev bd91230cf8
Merge pull request #1502 from aaronraimist/mautrix-twitter
Update links to Mautrix Twitter bridge
2022-01-04 08:48:09 +02:00
HarHarLinks c0f7c39f7d s/plabook/playbook 2022-01-03 18:34:21 +01:00
Aaron Raimist dc96526475
Update links to Mautrix Twitter bridge
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2022-01-03 01:05:13 +00:00
Chris van Dijk bc5efa0dbc Remove Jitsi web interface_config.js in favour of custom-interface_config.js
As of docker-jitsi-meet stable-6433 [1], `/config/interface_config.js`
is regenerated on every boot. The correct way to modify the interface
config is now via `/config/custom-interface_config.js`, which is
appended to a default copy of `interface_config.js` by
`/etc/cont-init.d/10-config` on every boot of the docker image.

Given that `interface_config.js` is considered deprecated by upstream
(all options will eventually be moved to `config.js`), we also deprecate
the `matrix_jitsi_web_interface_config_*` variables in favour of
`matrix_jitsi_web_custom_interface_config_extension`.

[1] https://github.com/jitsi/docker-jitsi-meet/blob/stable-6433/CHANGELOG.md#stable-6433
2022-01-02 10:54:51 +01:00
Jim Myhrberg 993121e517
feat(etherpad): add optional admin web-UI access
Enables optional access to Etherpad's web-UI. This is useful for
managing Etherpad plugins.

Among other things, plugins makes it easy to manage/delete pads if you
install the adminpads2 plugin.
2022-01-01 03:12:14 +00:00
Slavi Pantaleev 948c411106 Remove sudo requirement for generating SSL certificates
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1492
2021-12-30 10:47:06 +02:00
Toni Spets cdf76bdbb7
Upgrade Heisenbridge (1.8.2 -> 1.9.0) 2021-12-29 21:05:41 +02:00
Slavi Pantaleev d166a90514
Merge pull request #1493 from SierraKiloBravo/allow-configuring-mautrix-telegram-name-templates
Allow editing of MXID/dispname templates for mautrix-telegram users
2021-12-29 10:19:49 +02:00
Slavi Pantaleev 908dc6c07a
Merge pull request #1491 from HarHarLinks/webhooks_fork
switch appservice-webhooks fork
2021-12-28 18:25:03 +02:00
HarHarLinks c2f3586ac6 switch appservice-webhooks fork
turt2live/matrix-appservice-webhooks -> redoonetworks/matrix-appservice-webhooks
2021-12-28 17:12:28 +01:00
pushytoxin 1066baed38 Upgrade etherpad to 1.8.16
Extend the config template with the lines added in the past year
2021-12-28 15:02:28 +01:00
SierraKiloBravo 56e9ff1740 Added defaults and edited config template for mautrix-telegram, allowing editing of MXID/displayname templates for bridged users 2021-12-28 11:40:22 +01:00
Slavi Pantaleev 280c6c5424
Add |to_json 2021-12-27 21:45:13 +02:00
Alejo Diaz 297ed9ce36 Add encryption_enabled_by_default_for_room_type
This commit simply add encryption_enabled_by_default_for_room_type
variable.

Signed-off-by: Alejo Diaz <xlejo@protonmail.com>
2021-12-27 14:20:23 -03:00
Toni Spets 5df486f31e
Upgrade Heisenbridge (1.8.0 -> 1.8.2) 2021-12-25 18:05:41 +02:00