Commit Graph

25 Commits

Author SHA1 Message Date
Jim Myhrberg
eeca3c8dca
fix: avoid yaml being wrapped at column 80 via to_nice_yaml
The `to_nice_yaml` helper will by default wrap any string YAML values on
the first space after column 80. This can in worst case yield invalid
YAML syntax. More details in Ansible's documentation here:

https://docs.ansible.com/ansible/latest/user_guide/playbooks_filters.html#formatting-data-yaml-and-json

In short, you need to explicitly provide a custom width argument of a
high number of some kind to avoid the line wrapping.
2022-03-16 01:10:26 +00:00
Marko Weltzer
819574b8ba
Merge branch 'spantaleev:master' into master 2022-02-05 21:37:53 +01:00
Marko Weltzer
7e5b88c3b7 fix: all praise the allmighty yamllinter 2022-02-05 21:32:54 +01:00
Slavi Pantaleev
86c36523df Replace ExecStopPost with ExecStop
Reverts b1b4ba501f, 90c9801c56, a3c84f78ca, ..

I haven't really traced it (yet), but on some servers, I'm observing
`ansible-playbook ... --tags=start` completing very slowly, waiting
to stop services. I can't reproduce this on all Matrix servers I manage.
I suspect that either the systemd version is to blame or that some
specific service is not responding well to some `docker kill/rm` command.

`ExecStop` seems to work great in all cases and it's what we've been
using for a very long time, so I'm reverting to that.
2022-02-05 12:13:36 +02:00
Slavi Pantaleev
90c9801c56 Use ExecStopPost instead of ExecStop
This is the equivalent of b1b4ba501f for the matrix-dendrite role.
2022-01-07 16:00:51 +02:00
Slavi Pantaleev
61c0930325 Suppress output for ExecStartPre/ExecStop commands
This brings matrix-dendrite.service in line with all the other services.
2022-01-07 16:00:51 +02:00
Slavi Pantaleev
5c3c0d0d58 Set Dendrite's real_ip_header correctly 2022-01-07 16:00:51 +02:00
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
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
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