self-hosted/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-12-12 08:43:55 +02:00
Code Issues Releases Activity
1,783 Commits 4 Branches 0 Tags 25 MiB
1f9c173a7e
Commit Graph

1123 Commits

Author SHA1 Message Date
Panagiotis Vasilopoulos
baed917a13
Fixed repository link for mx-puppet-steam 
- https://github.com/icewind1991/mx-puppet-steam is the link that's referenced by the documentation.
- The previous link, https://github.com/matrix-steam/mx-puppet-steam, is invalid/inaccessible to the public.
 2020-07-05 23:28:03 +03:00
shadow
6293f1bdb0 Run all API self checks in check_mode 2020-07-04 15:24:33 +02:00
Slavi Pantaleev
f758ee90cb
Add |to_json to some values 2020-07-04 09:31:52 +03:00
Justin Croonenberghs
35c2655fa4 Removed troublesome #s 2020-07-03 19:01:03 -05:00
Justin Croonenberghs
1f21f0c09a Add variables for reCAPTCHA validation 2020-07-03 18:33:25 -05:00
Slavi Pantaleev
b08ee2f2fa Move Jitsi container image tag to a variable 
Related to #554 (Github Pull Request).
 2020-07-03 13:10:59 +03:00
Slavi Pantaleev
3710e04e10
Merge pull request #557 from izissise/mx-puppet-steam 
Add mx-puppet-steam
 2020-07-03 12:05:41 +03:00
Slavi Pantaleev
d5eb7eb949
Merge pull request #560 from aaronraimist/synapse-1.15.2 
Upgrade Synapse (1.15.1 -> 1.15.2)
 2020-07-02 18:41:51 +03:00
Aaron Raimist
78382b0ce4
Upgrade Synapse (1.15.1 -> 1.15.2) 2020-07-02 10:38:25 -05:00
Hugues Morisset
57f498217a Add mx-puppet-steam 2020-07-01 21:01:00 +02:00
Hugues Morisset
eb0df37247 Mx-puppet-discord Use official docker image 
https://github.com/matrix-discord/mx-puppet-discord/issues/80

Thanks Sorunome for setting up the automated build
 2020-07-01 13:33:01 +02:00
Hugues Morisset
42e7f5e9bc Add mx-puppet-discord 2020-07-01 13:31:31 +02:00
Slavi Pantaleev
744667b270 Merge branch 'master' into mx-puppet-twitter 2020-06-30 17:37:19 +03:00
Slavi Pantaleev
31f9e7bbea
Merge pull request #551 from jdreichmann/feat-mx-puppet-instagram 
Add mx-puppet-instagram
 2020-06-30 17:33:37 +03:00
Slavi Pantaleev
8b59402f79 Upgrade Coturn (4.5.1.2 -> 4.5.1.3) 
4.5.1.3 fixes a security vulnerability:
https://github.com/coturn/coturn/security/advisories/GHSA-c8r8-8vp5-6gcm
 2020-06-30 14:28:41 +03:00
Slavi Pantaleev
f41c5e89e5 Upgrade riot-web (1.6.6 -> 1.6.7) 2020-06-29 18:41:06 +03:00
Tulir Asokan
5b960bcfb5 Make sender_localpart configurable for mx-puppet-twitter 2020-06-29 18:04:40 +03:00
Tulir Asokan
13186a1ddc Add mx-puppet-twitter 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2020-06-29 15:28:43 +03:00
Slavi Pantaleev
de545f9c5f Update docs on self-building and remove useless variable 
`matrix_container_images_self_build` was not really doing anything
anymore. It previously was influencing `matrix_*_self_build` variables,
but it's no longer the case since some time ago.

Individual `matrix_*_self_build` variables are still available.
People that would like to toggle self-building for a specific component
ought to use those.

These variables are also controlled automatically (via
`group_vars/matrix_servers`) depending on `matrix_architecture`.

In other words, self-building is being done automatically for
all components when they don't have a prebuilt image for the specified
architecture. Some components only support `amd64`, while others also
have images for other architectures.
 2020-06-29 14:58:03 +03:00
Slavi Pantaleev
635f385971 Use pre-built arm64 image for ma1sd 
ma1sd 2.4.0 announced experimental support for arm64.
We're making use of those arm64 images instead of self-building.
 2020-06-29 14:53:23 +03:00
Slavi Pantaleev
f30d5e0950
Merge pull request #554 from teutat3s/jitsi-update-4627-1 
Update Jitsi to stable-4627-1
 2020-06-29 09:12:47 +03:00
teutat3s
784cb3e325
Update Jitsi to stable-4627-1 2020-06-28 22:00:08 +02:00
teutat3s
4cf59098ad
Update ma1sd to v2.4.0 2020-06-28 21:47:19 +02:00
Slavi Pantaleev
19b9a1b16c Expose mautrix-hangouts port if matrix-nginx-proxy is disabled 2020-06-28 09:01:48 +03:00
jdreichmann
0fea35cdd2
mx-puppet-instagram: add role 2020-06-27 15:23:21 +02:00
Slavi Pantaleev
a081979d39
Merge pull request #548 from pcorace/master 
Add variables to fine tune jitsi
 2020-06-27 08:01:54 +03:00
Pablo
69570de8a9 Rename variables 2020-06-25 11:20:40 -03:00
Slavi Pantaleev
5c5f1c6ab9 Add support for telling Riot to not default to E2EE 
Related to https://github.com/vector-im/riot-web/pull/13914
 2020-06-24 11:39:51 +03:00
Pablo
c341608480 Add variables to fine tune jitsi 2020-06-23 19:22:52 -03:00
Slavi Pantaleev
d2a0ec6aa9 Upgrade riot-web (1.6.5 -> 1.6.6) 2020-06-23 18:03:58 +03:00
Slavi Pantaleev
105b3524bb Upgrade riot-web (1.6.4 -> 1.6.5) 2020-06-16 19:22:45 +03:00
Slavi Pantaleev
10bc85962e Upgrade Synapse (1.15.0 -> 1.15.1) 2020-06-16 13:55:27 +03:00
Slavi Pantaleev
7729511a84 Make vars.yml snapshotting optional and more configurable 
Certain people organize their inventory in a different way
and we'd like to accommodate them.

Related to #542 (Github Issue).
 2020-06-14 10:01:22 +03:00
Slavi Pantaleev
67ab7e7a1b Preserve vars.yml on the server for easily restoring 
Fixes #542 (Github Issues).
 2020-06-13 07:52:01 +03:00
benkuly
d49ee51035 remove force pull matrix-sms-bridge docker image 2020-06-12 10:23:51 +02:00
benkuly
a0661a6012 updated sms bridge docker image 2020-06-12 08:37:08 +02:00
benkuly
11e53c4fbc add default region 2020-06-11 15:37:46 +02:00
benkuly
99639d7d7a Merge remote-tracking branch 'github/master' 2020-06-11 15:36:02 +02:00
Slavi Pantaleev
6538ae34f5 Upgrade Synapse (v1.14 -> v1.15) 
Fixes #539 (Github Issue).
 2020-06-11 16:02:01 +03:00
Hugues Morisset
d4938333e6 Fix missing conf for double puppeting in mx-puppet-slack 2020-06-11 11:10:13 +02:00
Slavi Pantaleev
440569c47b Update mautrix-facebook configuration 2020-06-10 09:20:06 +03:00
Slavi Pantaleev
10b3ceff72 Make Matrix federation port configurable 
Fixes #523 (Github Issue).
 2020-06-09 08:29:03 +03:00
Slavi Pantaleev
65e5020596 Proxy other /_synapse endpoints to the client API 
Besides /_synapse/admin, there are other things like
/_synapse/oidc, etc.

We should just proxy everything.

Fixes #534 (Github Issue).
 2020-06-09 08:12:58 +03:00
Slavi Pantaleev
ab32f6adf6 Add self-building support to matrix-mailer (exim-relay) 2020-06-08 09:52:34 +03:00
Slavi Pantaleev
1f414a44ff Upgrade matrix-mailer 2020-06-08 09:37:28 +03:00
Slavi Pantaleev
0113852504 Upgrade matrix-synapse-shared-secret-auth (1.0.1 -> 1.0.2) 
There's no change in the source code. Just a release bump for packaing
reasons. It doesn't matter much for us here, but let's be on the latest
tag anyway.
 2020-06-08 09:29:55 +03:00
dasTholo
331c77a651
Add Docker Network for matrix-mautrix-telegram-db for Telegram Bridge with Postgress 
Postgres setup like
matrix_mautrix_telegram_configuration_extension_yaml: |
  appservice:
    database: "postgres://XXX:XXX@matrix-postgres:5432/mxtg"

 will fail without the right Dockernetwork
 2020-06-06 12:42:25 +02:00
benkuly
77fd23149b added gammu hard reset for sms modem 2020-06-06 08:28:08 +02:00
Slavi Pantaleev
e4edfd5b12 Remove now-unnecessary /dev/null hacks from riot-web 
`/etc/nginx/conf.d/default.conf` was previously causing
some issues when used with our `--user`.

It's not the case anymore, so we can remove it.

Fixes #369 (Github Issue).
 2020-06-06 08:47:56 +03:00
Slavi Pantaleev
88a4a3ab55 Update components 2020-06-06 08:25:27 +03:00
Slavi Pantaleev
b0b744dede Add periodic reconnection configuration to mautrix-facebook bridge 2020-06-05 15:21:41 +03:00
Slavi Pantaleev
c838bd2f46
Merge pull request #514 from benkuly/master 
added matrix-sms-bridge
 2020-06-05 14:52:41 +03:00
benkuly
f68e47d3c4 renamed role matrix-sms-bridge to matrix-bridge-sms 2020-06-05 12:25:41 +02:00
Slavi Pantaleev
0fce642179 Upgrade riot-web (1.6.2 -> 1.6.3) 2020-06-04 19:52:55 +03:00
benkuly
85c6befc04 removed unused delivery report 2020-06-03 20:02:37 +02:00
benkuly
b60a4ac643 mount as slave 2020-06-03 14:25:23 +02:00
benkuly
3a3b95abfc added dev volume to find serial by id 2020-06-03 13:13:25 +02:00
benkuly
41b1925b2a remove dev mount 2020-06-03 13:07:36 +02:00
benkuly
0967bc3cd9 added missing z flag 2020-06-03 12:03:44 +02:00
Slavi Pantaleev
c00a7c2fe9 Update mautrix-facebook configuration (invitation, backfilling support) 2020-06-03 09:35:31 +03:00
Slavi Pantaleev
5da31ba579 Move configuration templates outside of defaults/main.yml files 2020-06-03 09:33:28 +03:00
benkuly
26846a5f6c try privileged way 2020-06-02 22:04:52 +02:00
benkuly
2fd8216fbc try to fix device reconnect issues 2020-06-02 18:27:33 +02:00
benkuly
cd17928805 revert remove of frequency 2020-06-02 14:56:22 +02:00
benkuly
f383b152da removed gammu reset frequency 
because the tty port will change
 2020-06-02 14:49:55 +02:00
benkuly
0b7d6744bf added more docs and timeout value 2020-06-02 08:39:30 +02:00
Slavi Pantaleev
f56a9a0f5f
Merge pull request #524 from cnvandijk/fix-executable-path 
Remove hardcoded paths to commands on the host machine
 2020-05-28 15:39:25 +03:00
Slavi Pantaleev
8bae39050e Update settings for Synapse v1.14.0 2020-05-28 15:23:05 +03:00
tctovsli
45ba01510d
Synapse v.1.14.0 2020-05-28 14:04:37 +02:00
Chris van Dijk
74df10633a Remove hardcoded command paths in playbook cron usage 2020-05-27 23:14:58 +02:00
Chris van Dijk
6e3b877dc2 Remove hardcoded command paths in playbook shell usage 2020-05-27 23:14:56 +02:00
Chris van Dijk
6334f6c1ea Remove hardcoded command paths in systemd unit files 
Depending on the distro, common commands like sleep and chown may either
be located in /bin or /usr/bin.

Systemd added path lookup to ExecStart in v239, allowing only the
command name to be put in unit files and not the full path as
historically required. At least Ubuntu 18.04 LTS is however still on
v237 so we should maintain portability for a while longer.
 2020-05-27 23:14:54 +02:00
Ugurtan
5ace3f4a1c
fix for importing sqllite database 
the current version fails the import, because the volume for the media is missing. It still fails if you have the optional shared secret password provider is enabled, so that might need another mount. Commenting out the password provider in the hoimeserver.yaml during the run works as well.
 2020-05-27 18:13:36 +02:00
benkuly
e4f128a1ba fixed wrong gammu path 2020-05-26 18:19:22 +02:00
benkuly
3d63ee6d13 add group dialout to container 2020-05-26 18:12:26 +02:00
Slavi Pantaleev
a353217cf3 Add delivery_receipts option for matrix-bridge-mautrix-facebook 2020-05-26 09:49:12 +03:00
benkuly
a7fd27c43c removed jinja command 2020-05-25 19:36:19 +02:00
benkuly
ecf3116c4a fixed wrong gammu config dest 2020-05-25 19:34:40 +02:00
benkuly
f8663512de fixed wrong paths 2020-05-25 19:31:03 +02:00
benkuly
805708e089 fix wrong used paath for gammu config file 2020-05-25 19:21:07 +02:00
benkuly
73b71a34c8 try to fix gammu-smsdrc is not a file 2020-05-25 19:19:30 +02:00
benkuly
1f570b3251 revert last change 2020-05-25 19:09:08 +02:00
benkuly
469554b836 try to use other mount option 
to prevent docker from using dir instead of file
 2020-05-25 19:04:56 +02:00
benkuly
eb8e3572fd fixed wrong behaviour of gammu 2020-05-25 15:37:46 +02:00
benkuly
f0ff8112c7 database admin username must be neo4j 2020-05-23 20:51:07 +02:00
benkuly
fe54690ea1 fixed missing registration var 2020-05-23 15:32:16 +02:00
benkuly
63705f94f1 removed templates 2020-05-23 15:30:31 +02:00
benkuly
c802009b5c fixed wrong var name 2020-05-23 15:12:56 +02:00
benkuly
be101a3114 added missing service to service list 2020-05-23 14:16:44 +02:00
benkuly
9ed80e754b added missing variable 2020-05-23 13:54:07 +02:00
benkuly
1ffa4a326c matrix-sms-bridge: 
added docs, added seperate service for database, pr comments
 2020-05-23 13:14:24 +02:00
Slavi Pantaleev
4c4f208613 Upgrade mautrix-telegram (0.7.0 -> 0.7.2) 2020-05-22 19:54:30 +03:00
Slavi Pantaleev
5c7e5c57bd Upgrade riot-web (1.6.1 -> 1.6.2) 2020-05-22 18:08:17 +03:00
benkuly
4913ca4bb2 matri-sms-bridge: 
better path handling, fixed some mistakes
 2020-05-22 13:59:38 +02:00
benkuly
2d75fca257 added matrix-sms-bridge 2020-05-22 13:50:59 +02:00
Slavi Pantaleev
3198ed0dc9 Add missing matrix_mx_puppet_slack_container_http_host_bind_port variable 2020-05-22 11:12:06 +03:00
Slavi Pantaleev
4111e42070
Merge pull request #513 from joao-p-marques/fix/mx-puppet-bridge 
Fix/mx puppet bridge
 2020-05-22 10:53:37 +03:00
joao-p-marques
afd6d7e45a change var name to correct one 2020-05-21 23:40:54 +01:00
joao-p-marques
c1bb4f680e enable oauth 2020-05-21 23:40:38 +01:00
Dan Arnfield
ee3944bcdb Update postgres (12.2 -> 12.3, etc) 2020-05-21 11:40:40 -05:00
Slavi Pantaleev
8fb3ce6f6d Upgrade Synapse (v1.12.4 -> v1.13.0) 2020-05-19 21:35:32 +03:00
Slavi Pantaleev
a3259bbd77
Add |to_json to some variables 2020-05-19 21:15:23 +03:00
louis
a03e95b7eb enable by default v2 api prefix for ma1sd 2020-05-19 17:06:11 +02:00
Slavi Pantaleev
7a2dbdc2d7 Update components 2020-05-19 15:06:35 +03:00
Slavi Pantaleev
ba23779b05 Fix incorrect Jitsi container image tags 
Related to #508 (Github Pull Request).
 2020-05-17 21:23:18 +03:00
teutat3s
47001258b5
Ensure prosody plugin path created / permissions 2020-05-17 14:19:58 +02:00
teutat3s
fbd8f3ec9b
Jitsi prosody: add volume /prosody-plugins-custom 2020-05-16 15:12:51 +02:00
teutat3s
c2df3d7bbf
Update jitsi containers to 4548-1 2020-05-16 15:00:44 +02:00
Marcel Partap
93f4111654 Prevent 404s when Riot tries to retrieve domain-specific config.json 
Riot unconditionally asks for a config.${document.domain}.json, c.f.
https://github.com/vector-im/riot-web/blame/develop/src/vector/getconfig.ts#L24
 2020-05-13 18:34:14 +02:00
Dan Arnfield
787f12e70d Fix typo in validation 2020-05-08 13:56:31 -05:00
Slavi Pantaleev
dd527d5968 Ensure correct dimension.db file ownership 
This is mostly here to guard against problems happening
due to server migration and doing `chown -R matrix:matrix /matrix`.

Normally, the file is owned by `1000:1000`, as expected.

If ownership changes, Dimension could still start, but it will fail the
first time it tries to write to the database. Explicitly chowning
before startup guards against this.

Related to #485 and #486 (Github Pull Requests).
Also related to ccc7aaf0ce.
 2020-05-06 11:28:09 +03:00
Slavi Pantaleev
ae1b1be3f4 Do not use matrix:matrix for Dimension configuration 
Dimension runs as the `node` user in the container (`1000:1000`).
It doesn't seem like we have a way around it. Thus, its configuration
must also be readable by that user (or group, in this case).
 2020-05-06 11:20:14 +03:00
Slavi Pantaleev
c1c8b8e62c Warn about matrix_user_uid/matrix_user_gid 
We don't really need to fail in such a spectactular way,
but it's probably good to do. It will only happen for people
who are defining their own user/group id, which is rare.

It seems like a good idea to tell them that this doesn't work
as they expect anymore and to ask them to remove these variables,
which otherwise give them a fake sense of hope.

Related to #486 (Github Pull Request).
 2020-05-06 10:17:19 +03:00
Slavi Pantaleev
36c61b5b4e Introduce a separate group variable (matrix_user_groupname) 
Related to #485 (Github Pull Request).
 2020-05-06 10:02:47 +03:00
Slavi Pantaleev
ccc7aaf0ce Fix "Migrating to a new server" flow due to dynamic user/group creation 2020-05-06 09:55:40 +03:00
Slavi Pantaleev
6032affc20
Merge pull request #486 from FanchTheSystem/avoid_fixed_uid_and_gid 
Remove default UID/GID
 2020-05-06 09:46:49 +03:00
Slavi Pantaleev
8fea6f5130 Make sure matrix_user_uid and matrix_user_gid are always set 
If one runs the playbook with `--tags=setup-all`, it would have been
fine.

But running with a specific tag (e.g. `--tags=setup-riot-web`) would
have made that initialization be skipped, and the `matrix-riot-web` role
would fail, due to missing variables.
 2020-05-06 09:43:30 +03:00
Slavi Pantaleev
4359571d38 Upgrade riot-web to v1.6.0 2020-05-05 14:02:14 +03:00
Fanch
a1c5a197a9 remove default UID/GID 2020-05-04 21:43:54 +02:00
Dan Arnfield
e750c6c6ff Update coturn (4.5.1.1 -> 4.5.1.2) 2020-05-04 09:46:45 -05:00
Horvath Gergely
d6266a8c47 fix skype bridge being rebuilt when upstream changed 2020-05-01 21:34:42 +02:00
Chris van Dijk
7585bcc4ac Allow the matrix user username and groupname to be configured separately 
No migration steps should be required.
 2020-05-01 19:59:32 +02:00
Chris van Dijk
cf0e56e92b Consistent usage of matrix username and groupname, not uid and gid 
This should be a no-op, no migration necessary.
 2020-05-01 19:39:17 +02:00
Chris van Dijk
741064a178 Fix group ownership of Dimension base path and config 
Ansible will migrate the ownership of the base path and config path, but
manual intervention will be required in order to migrate the ownership
of files in those directories (i.e. dimension.db).

Stop the services:

  (local)$ ansible-playbook -i inventory/hosts setup.yml --tags=stop

Fix the permissions on the server:

  (server)# chown -Rv "{{ matrix_user_username }}:{{ matrix_user_username }}" "{{ matrix_dimension_base_path }}"

which would typically look like:

  (server)# chown -Rv matrix:matrix /matrix/dimension/

Reconfigure Dimension and start the services:

  (local)$ ansible-playbook -i inventory/hosts setup.yml --tags=setup-dimension,start
 2020-05-01 19:28:30 +02:00
Slavi Pantaleev
0e26810162
Merge pull request #478 from cnvandijk/feature-jitsi-ldap-auth 
Add support for Jitsi LDAP authentication
 2020-04-30 10:09:48 +03:00
Chris van Dijk
9d6614e80f Add support for Jitsi LDAP authentication 2020-04-29 17:57:38 +02:00
Slavi Pantaleev
669780976f
Update mappings configuration example 2020-04-29 09:29:03 +03:00
John Goerzen
a2df0016eb Update matrix-appservice-irc to 0.16.0 
Note the potential breaking change

Resolves #474
 2020-04-28 11:43:52 -05:00
GuillauG
29f606bac7
Add 'permalinkPrefix' and 'default_theme' for configuring riot web (#472) 
* add permalinkPrefix to riot-web config

* add feature to change default theme of riot-web via its config file

* remove matrix_riot_web_change_default_theme and provide sane default
 2020-04-28 13:10:33 +03:00
teutat3s
37d427c05c
Update Jitsi docker images to stable 4416 2020-04-28 03:52:43 +02:00
Slavi Pantaleev
438652c732 Switch Slack image to a working tag 
We've had reports of the `:latest` tag not working anymore,
leading to an error as described here:
https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/341
 2020-04-27 10:49:06 +03:00
Slavi Pantaleev
9cc0c5955d Use |quote in some command calls 2020-04-24 09:59:30 +03:00
Aaron Raimist
23bfaa72ec
Upgrade Synapse (1.12.3 -> 1.12.4) 2020-04-23 13:30:50 -05:00
Rodrigo Belem
033dfcb26f Remove duplicated whitelist entry in skype main.yml 2020-04-23 09:06:08 -04:00
Rodrigo Belem
4149e03b69 Initial mx-puppet-slack bridge role 2020-04-23 09:06:08 -04:00
Slavi Pantaleev
272888d917
Merge pull request #462 from cnvandijk/feature-dimension-unfederated 
Add support for running dimension in an unfederated environment
 2020-04-22 22:47:14 +03:00
Slavi Pantaleev
0af5a8c4cc Simplify mx-puppet-skype blacklists a bit 
Related to #466 (Github Pull Request).
 2020-04-22 22:42:24 +03:00
Rodrigo Belem
b08a49d94d Allow skype more configurations for relay and provisioning 2020-04-22 15:26:31 -04:00
Chris van Dijk
3f4bc9b881 Move config supprt for unfederated dimension into group_vars 2020-04-22 19:23:56 +02:00
Slavi Pantaleev
9991d545dd Add note about synapse-janitor and require explicit confirmation for usage 
Fixes #465 (Github Issue).

Related to https://github.com/xwiki-labs/synapse_scripts/pull/12.
 2020-04-21 21:48:06 +03:00
Slavi Pantaleev
554da8338a
Merge pull request #463 from hooger/architecture 
Architecture
 2020-04-20 16:45:59 +03:00
Dan Arnfield
e2de6a1569 Update nginx (1.17.9 -> 1.17.10) 2020-04-19 08:38:53 -05:00
Horvath Gergely
bd61598faf add experimental(?) architecture support for arm32 and arm64 
the changes are necessary because certbot images are tagged, so docker does not recognize the necessary architecture
 2020-04-18 22:55:19 +02:00
Chris van Dijk
da2e90dcc1 Remove check for "Fail if Matrix Federation is disabled" 
This playbook now suports running dimension in both a federated and an
unfederated environment.
 2020-04-18 19:01:45 +02:00
Chris van Dijk
3ddb8cd148 Add support for running dimension in an unfederated environment 
This config change follows:

  https://github.com/turt2live/matrix-dimension/blob/master/docs/unfederated.md
 2020-04-18 19:00:20 +02:00
Horvath Gergely
203a319881 force build docker image if git master changes 2020-04-18 12:56:36 +02:00
Slavi Pantaleev
c13c29f48e Fix |to_nice_yaml breaking formatting 
Well, actually 8cd9cde won't work, unless we put the
`|to_nice_yaml` thing on a new line.

We can, but that takes more lines and makes things look uglier.
Using `|to_json` seems good enough.

The whole file is parsed as YAML later on and merged with the
`_extension` variable before being dumped as YAML again in the end.
 2020-04-18 11:06:53 +03:00
Slavi Pantaleev
8cd9cdead0 Improve consistency 2020-04-18 11:05:47 +03:00
Slavi Pantaleev
27cae3d90c
Merge pull request #461 from lampholder/toml/allowed_local_3pids 
Expose allowed local 3pids as a configurable option
 2020-04-18 11:05:01 +03:00
Tom
e54428b160 Expose allowed local 3pids as a configurable option 2020-04-18 00:11:30 +01:00