Commit Graph

4848 Commits

Author SHA1 Message Date
Slavi Pantaleev
4685509171
Merge pull request #1979 from mcnesium/SC2086
Double quote to prevent globbing and word splitting.
2022-07-26 12:47:37 +03:00
mcnesium
d5f1e5e8f4
Double quote to prevent globbing and word splitting. 2022-07-26 11:32:58 +02:00
Slavi Pantaleev
c85c062c01 Upgrade ddclient (v3.9.1-ls92 -> v3.9.1-ls93) 2022-07-26 09:08:33 +03:00
Slavi Pantaleev
532c4ffb71 Use force=false for appservice-kakaotalk-node
Not that it matters. This option is only used when `type` is `unix`.
2022-07-25 16:54:37 +03:00
Slavi Pantaleev
e5c4731f68 Use kakaotalk_ as the puppet prefix
This is what upstream uses and also what
https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1977
used.

Initially, I wanted to make the prefix more unique, in case another
Kakaotalk bridge comes along, but.. it's probably on the new bridge to
come up with a unique puppet prefix, not on us now to override upstream
decisions.
2022-07-25 16:01:15 +03:00
Slavi Pantaleev
d14e499365 Add dedicated variables for controlling Kakaotalk encryption 2022-07-25 16:01:15 +03:00
Slavi Pantaleev
7b937cf9a9 Make ansible-lint happy 2022-07-25 16:01:15 +03:00
Slavi Pantaleev
e46ba5deba Add matrix-appservice-kakaotalk support
Adds support for: https://src.miscworks.net/fair/matrix-appservice-kakaotalk

This is pretty similar to
https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1977
which just appeared, but has mostly been done independently.

I've taken some inspiration and did some fixups based on that PR.
Thanks to https://github.com/hnarjis for taking the time to contribute!

Notable differences between this branch compared to that PR:

- better naming and documentation around the "configuration" variables
- no unnecessary (5 sec.) intentional delay when starting `matrix-appservice-kakaotalk-node.service`
- stores configuration in `config/`, not in `data/`
- passes configuration as read-only and starts the bridge with (`--no-update`) to ensure no changes are made to it
- starts containers more securely - with `matrix:matrix` user:group (not `root`) and
  reduced capabilities (`--cap-drop=ALL`)
- uses `tcp` for communication between the "node" and the appservice (simpler than sharing unix sockets)
- `registration.yaml` which is closer to the one generated by `matrix-appservice-kakaotalk` (no `de.sorunome.msc2409.push_ephemeral` stuff, etc.)
- `registration.yaml` which is more customizable (customizable bot username and prefix for puppets - see `matrix_appservice_kakaotalk_appservice_bot_username` and `matrix_appservice_kakaotalk_user_prefix`)
- less fragile and more extensible bridge permissions configuration via `matrix_appservice_kakaotalk_bridge_permissions`. Doing `{% if matrix_admin %}` in the bridge configuration sometimes causes syntax problems (I hit some myself) and is not ideal. Other bridges should be redone as well.
- configurable command prefix for the bridge, instead of hardcoding `!kt` (see `matrix_appservice_kakaotalk_command_prefix`)
- logging that is more consistent with the rest of the playbook (console / journald only, no logging to files), as well as configurable log level (via `matrix_appservice_kakaotalk_logging_level`)
- somewhat more detailed documentation (`docs/configuring-playbook-bridge-appservice-kakaotalk.md`)
- removed some dead code (data relocation tasks from `tasks/setup_install.yml`, as well as likely unnecessary SQLite -> Postgres migration)
2022-07-25 16:01:15 +03:00
Slavi Pantaleev
163a423f42 Fix ansible-lint error 2022-07-25 16:01:04 +03:00
Slavi Pantaleev
ac72879bf5 Make bridge permissions more easily configurable
Not doing {% if matrix_admin %} checks in the YAML also fixes some issues
with indentation being incorrect sometimes.

This should be backward compatible, except for mautrix-signal's case
where `matrix_mautrix_signal_bridge_permissions` previously existed
as a string, not a dictionary. `tasks/validate_config.yml` will catch
the problem an even provide a quick fix.
2022-07-25 15:57:16 +03:00
Slavi Pantaleev
b2f47fcfcd Make linkedin logging level configurable 2022-07-25 15:57:16 +03:00
Slavi Pantaleev
9e65ba3298
Merge pull request #1958 from xangelix/migrate-mx-puppet-groupme-repo
Migrate mx-puppet-groupme to new repo
2022-07-25 15:15:06 +03:00
Slavi Pantaleev
53ea0ccca5 Fix linkedin bridge building regression
Regression since 1693c4ca1d

Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1975
2022-07-23 09:07:34 +03:00
Slavi Pantaleev
c5278621ca
Merge pull request #1976 from ayonoaduo/patch-1
Minor typo update
2022-07-22 22:47:43 +03:00
Onisokien Ayonoadu
50ae4d2422
Minor typo update 2022-07-22 13:11:38 -06:00
MdotAmaan
8621ff1379 Add Mautrix Discord Bridge 2022-07-22 18:55:44 +04:00
Slavi Pantaleev
720b6a2ab7
Merge pull request #1971 from Maxdeso/master
dendrite_recaptcha_siteverify_api
2022-07-22 08:47:41 +03:00
Maxdeso
75961359fb dendrite_recaptcha_siteverify_api 2022-07-21 20:54:56 +03:00
Slavi Pantaleev
1f9c7e746d
Merge pull request #1967 from aaronraimist/hydrogen
Allow new Hydrogen options from #1940 to be customized
2022-07-21 18:26:33 +03:00
Aaron Raimist
14296db9ef
Update roles/matrix-client-hydrogen/defaults/main.yml
Co-authored-by: Slavi Pantaleev <slavi@devture.com>
2022-07-21 15:24:08 +00:00
Slavi Pantaleev
9923a9e70f
Merge pull request #1970 from anoadragon453/patch-1
Fix link to maubot docs in README
2022-07-21 17:26:55 +03:00
Slavi Pantaleev
d81a186f49
matrix-maubot -> maubot 2022-07-21 17:26:48 +03:00
Slavi Pantaleev
cddd76b9c9
Merge pull request #1969 from kleo/patch-1
Borg backup provide ssh key example format
2022-07-21 17:21:35 +03:00
Andrew Morgan
e05abfb9d1
Fix link to maubot docs in README 2022-07-21 15:20:47 +01:00
Slavi Pantaleev
57e8769c5e
Add hint about matrix_backup_borg_ssh_key_private indentation 2022-07-21 17:07:06 +03:00
kleo
db94653b42
Borg backup provide ssh key example format 2022-07-21 21:56:52 +08:00
Slavi Pantaleev
4155ed2518 Leave docker_image module calls unprefixed to increase compatibility
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1965
2022-07-21 11:24:47 +03:00
Slavi Pantaleev
b9d7e24859
Merge pull request #1957 from mholt/patch-1
Update configuring-well-known.md
2022-07-21 10:30:34 +03:00
Aaron Raimist
b8d3453e32
lint 2022-07-21 03:17:34 +00:00
Aaron Raimist
0e77d2c2f5
lint 2022-07-21 03:15:35 +00:00
Aaron Raimist
ca5d7df161
Allow new Hydrogen options from #1940 to be customized 2022-07-21 03:12:42 +00:00
Matt Holt
9e87f9d885
Update configuring-well-known.md 2022-07-20 12:10:34 -06:00
Slavi Pantaleev
4f4646dabd
Merge pull request #1964 from roughnecks/Upgrade-heisenbridge-1.13.0---1.13.1
Upgrade heisenbridge 1.13.0 1.13.1
2022-07-20 20:52:00 +03:00
Simone
db604f81ec Upgrade heisenbridge 1.13.0 1.13.1 2022-07-20 19:21:23 +02:00
Slavi Pantaleev
5218ac03ac
Merge pull request #1963 from etkecc/patch-29
Update Grafana 9.0.3 -> 9.0.4
2022-07-20 19:58:17 +03:00
Aine
592c88b021
Update Grafana 9.0.3 -> 9.0.4 2022-07-20 16:52:03 +00:00
Slavi Pantaleev
89bd25995a Upgrade Synapse (v1.63.0 -> v1.63.1) 2022-07-20 16:06:01 +03:00
Slavi Pantaleev
01a7c32a2c
Merge pull request #1961 from moan0s/docker-image-fix
Add matrix-registreation-bot docker image
2022-07-20 14:23:23 +03:00
Julian-Samuel Gebühr
ff2ba1d5b1 Add matrix-registreation-bot docker image 2022-07-20 12:18:11 +02:00
Slavi Pantaleev
90551e82ec Make use of matrix_bot_maubot_management_interface_port variable to actually make maubot port configurable
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1894
2022-07-20 13:06:11 +03:00
Slavi Pantaleev
8a689813ff Remove unused maubot variable
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1894
2022-07-20 13:04:35 +03:00
Slavi Pantaleev
5ce2732899 Make maubot logging level configurable
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1894
2022-07-20 13:03:50 +03:00
Slavi Pantaleev
b575409ed7 Use |to_json in maubot configuration
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1894
2022-07-20 13:02:19 +03:00
Slavi Pantaleev
e5238bf7d5 Announce maubot
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1894
2022-07-20 12:55:18 +03:00
Slavi Pantaleev
d2fb6a86e1 Fix matrix-bot-maubot.service.j2 indentation (tabs only)
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1894
2022-07-20 12:55:15 +03:00
Slavi Pantaleev
46ced6134c Store maubot configuration separately from data
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1894

Because the configuration file is now mounted as readonly and maubot tries to update it on start,
we get this warning:
> Failed to create tempfile to write updated config to disk: [Errno 30] Read-only file system: '/config/tmpfa8vcb3y.yaml'

It doesn't seem to cause issues though.

Because the configuration is no longer overwritten on every bot start, each
next Ansible run should no longer overwrite it again and report a
"changed" task.
2022-07-20 12:54:43 +03:00
Slavi Pantaleev
d1649ff67b Do not restart matrix-bot-maubot.service on every playbook run
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1894
2022-07-20 12:40:30 +03:00
Julian-Samuel Gebühr
b20cfc5015
Clear up maubot role (#1960)
* Make interface hidden behind proxy by default

* Remove expose option and replace with http_bind_port

Reasoning: This is a similar binary trigger but allows to bin not on all interfaces

* Clarify maubot admin purpose

* Remove unnecessary edif

* Extend docs to prevent common misconceptions

* Make http_bind_port singular, do not allow multiple values

* Make optional again
2022-07-20 12:23:32 +03:00
Slavi Pantaleev
a1bfad1e9b Fix whitespace in matrix_bot_maubot_database_connection_string 2022-07-20 11:16:49 +03:00
Slavi Pantaleev
b8832e3014 Fix some Jinja2 inconsistencies in maubot role 2022-07-20 10:27:13 +03:00