Commit Graph

5168 Commits

Author SHA1 Message Date
Slavi Pantaleev
a19f239f06
Merge pull request #2237 from etkecc/master
remove etherpad nginx config automatically
2022-11-05 21:28:18 +02:00
Aine
a4dbc27f34
remove etherpad nginx config automatically 2022-11-05 19:40:09 +02:00
Slavi Pantaleev
844f05dcef
Merge pull request #2235 from drelephant/fixgradle
stop gradle pacman error on ubuntu
2022-11-05 15:41:48 +02:00
drelephant
5642586820
Merge branch 'spantaleev:master' into fixgradle 2022-11-06 00:39:42 +11:00
mouse
5e1bcf3f76 stop gradle pacman error on ubuntu 2022-11-06 00:20:44 +11:00
Slavi Pantaleev
5fdcead744
Merge pull request #2233 from etkecc/etherpad-soffice-option
etherpad: add abiword and soffice config options, update log level
2022-11-05 14:28:58 +02:00
Aine
e3b3f07607
etherpad: add abiword and soffice config options 2022-11-05 13:19:00 +02:00
Slavi Pantaleev
663f0bc5ef Install openssl using ansible.builtin.package, not using a distro-specific package manager module
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2228
2022-11-05 12:10:59 +02:00
Slavi Pantaleev
5ef70015cb Ensure git is installed using ansible.builtin.package, not using a distro-specific package manager module
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2228
2022-11-05 12:09:32 +02: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
39e4b419dd
matrix-etherpad: fail when mode is 'dimension', but dimension is disabled 2022-11-05 09:29:53 +02:00
Slavi Pantaleev
2473cd655b Include ensure_openssl_installed and ensure_fuse_installed utils in a more reliable way
This fixes a regression since the change done in c1c152f7ac.
When another role (say `matrix-jitsi`) included `roles/custom/matrix-base/tasks/util/ensure_openssl_installed.yml`,
which then included `{{ role_path }}/tasks/util/ensure_openssl_installed_DISTRO.yml`,
that `role_path` variable would end up being the parent role
(`matrix-jitsi`) and not the `matrix-base` role, so we'd get a failure.

An alternative solution may have been to avoid using `role_path`, but
importing roles properly (like we've done in this patch) sounds like a better way.

Unfortunately, `import_role` fails if `tasks_from` is something like
`util/ensure_openssl_installed` (containing a `/`), so I had to move
these utils out of `util/`.

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2228
2022-11-05 09:18:58 +02:00
Aine
06eb186729
add matrix_etherpad_mode 2022-11-05 09:17:47 +02:00
Slavi Pantaleev
c1c152f7ac Include potentially distro-specific tasks at runtime
This avoids Ansible trying to ensure `community.general.pacman` is
available, even if that module will never run (because `when` says so).

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2228
2022-11-05 08:31:22 +02:00
Slavi Pantaleev
264d1716e0
Merge pull request #2230 from etkecc/fix-workers-yaml-include-path
Keep Synapse worker definitions in vars.yml to avoid an extra file include on each playbook task
2022-11-05 07:45:13 +02:00
Slavi Pantaleev
6c524302d6 Add intentionally-ignored-endpoints to intentionally-ignored-endpoints for completeness 2022-11-05 07:40:56 +02:00
Slavi Pantaleev
a9e2607d80 Fix yaml[comments-indentation] in workers config and remove automation 2022-11-05 07:29: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
Slavi Pantaleev
c165bf0a95 Try to make setup.yml more helpful when galaxy roles haven't been downloaded
With this change, trying to run the playbook should report an error that
looks like this:

> The offending line appears to be:
>
>     # Most of the roles below are not distributed with the playbook, but downloaded separately using `ansible-galaxy` via the `make roles` command (see `Makefile`).
>     - role: galaxy/com.devture.ansible.role.playbook_help
>       ^ here

.. with that comment included, which might help some people who missed
the `make roles` part.

Improves https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2232
2022-11-05 07:02:10 +02:00
Slavi Pantaleev
5ff59eb31a Upgrade com.devture.ansible.role.playbook_state_preserver 2022-11-05 06:56:10 +02:00
Slavi Pantaleev
043344fa4d
Merge pull request #2231 from xyzst/update-dendrite-0.10.7
dendrite: update image tag to latest release (0.10.7)
2022-11-04 23:17:05 +02:00
Darren Rambaud
1c643263dd dendrite: update image tag to latest release (0.10.7)
- https://github.com/matrix-org/dendrite/releases/tag/v0.10.7
2022-11-04 15:16:14 -05:00
Aine
da4a82c48b
remove old workers.yml (already saved into main.yml) 2022-11-04 19:02:24 +02:00
Aine
37d4bf0d1c
fix workers-doc-to-yaml 2022-11-04 18:55:57 +02:00
Aine
9b97957022
Merge branch 'master' into make-etherpad-great-again 2022-11-04 17:36:15 +02:00
Aine
a86cb2336a
etherpad - do not request ssl cert for subdomain if dimension is installed 2022-11-04 17:16:29 +02:00
Slavi Pantaleev
a4e2a3bc07 Upgrade Hydrogen (v0.3.2 -> v0.3.3) 2022-11-04 17:07:29 +02:00
Slavi Pantaleev
d3bd1ca024 matrix_*_retries_{count,delay} -> devture_playbook_help_*_retries_{count,delay} 2022-11-04 16:44:29 +02:00
Slavi Pantaleev
4f4c856e43 matrix_host_command_systemctl -> devture_systemd_docker_base_host_command_systemctl (via com.devture.ansible.role.systemd_docker_base) 2022-11-04 16:41:23 +02:00
Slavi Pantaleev
7086c0ebe3 matrix_host_command_sh -> devture_systemd_docker_base_host_command_sh (via com.devture.ansible.role.systemd_docker_base) 2022-11-04 16:40:25 +02:00
Slavi Pantaleev
a9a81460ec matrix_host_command_docker -> devture_systemd_docker_base_host_command_docker (via com.devture.ansible.role.systemd_docker_base) 2022-11-04 16:39:35 +02:00
Slavi Pantaleev
835d2e9581 matrix_systemd_path -> devture_systemd_docker_base_systemd_path (via com.devture.ansible.role.systemd_docker_base) 2022-11-04 16:38:38 +02:00
Slavi Pantaleev
f03f716989 matrix_systemd_unit_home_path -> devture_systemd_docker_base_systemd_unit_home_path (via com.devture.ansible.role.systemd_docker_base) 2022-11-04 16:37:47 +02:00
Slavi Pantaleev
04c6c11561 Install ntpd/systemd-timesync via com.devture.ansible.role.timesync 2022-11-04 16:34:23 +02:00
Slavi Pantaleev
db19482d0c Replace matrix_playbook_runtime_results with devture_playbook_runtime_messages_list (via com.devture.ansible.role.playbook_runtime_messages) 2022-11-04 16:19:17 +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
4cbea602dd Sync appservice-discord configuration with upstream 2022-11-03 11:50:40 +02:00
Slavi Pantaleev
995ef460e7 Upgrade appservice-discord (3.0.0 -> 3.1.0) 2022-11-03 11:46:12 +02:00
Slavi Pantaleev
a3319b1dc2 Adjust .gitignore
Related to 410a915a8a
2022-11-03 09:16:54 +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
Slavi Pantaleev
6c131138ad
Merge pull request #2161 from meenzen/mautrix-discord-restricted-rooms-config
fix(mautrix-discord): allow configuring the restricted_rooms option
2022-11-03 07:44:07 +02:00
Slavi Pantaleev
e1cfb6e79f
Make yamllint happy 2022-11-03 07:42:08 +02:00
Samuel Meenzen
752d2ba8d0
Update matrix_servers 2022-11-02 20:39:14 +01:00
Samuel Meenzen
c330b85de3
Merge branch 'spantaleev:master' into mautrix-discord-restricted-rooms-config 2022-11-02 20:36:04 +01:00
Slavi Pantaleev
c96878275c
Merge pull request #2224 from Michael-Hollister/bugfix/fix-synapse-stream-writer-workers
Fixed filter for Synapse stream_writer HS config
2022-11-02 10:24:10 +02:00
Slavi Pantaleev
0048c574ca
Merge pull request #2226 from etkecc/patch-111
Pin mautrix-instagram to v0.2.2
2022-11-02 10:14:23 +02:00
Aine
0fd9f3d4f9
Pin mautrix-instagram to v0.2.2 2022-11-02 07:21:09 +00:00
Slavi Pantaleev
8a609e5cf2 Fix some ansible-lint-reported errors 2022-11-02 07:00:45 +02:00