From d0c0a204bc521a44520263252fe57ae3bfc8b016 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 26 Aug 2022 07:29:50 +0300 Subject: [PATCH 1/2] Fix --tags=register-user for Dendrite Regression since 3f8cb96a1863 - https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2048 Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2057 --- roles/matrix-dendrite/tasks/register_user.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/matrix-dendrite/tasks/register_user.yml b/roles/matrix-dendrite/tasks/register_user.yml index e1b974825..d37e633bf 100644 --- a/roles/matrix-dendrite/tasks/register_user.yml +++ b/roles/matrix-dendrite/tasks/register_user.yml @@ -9,6 +9,11 @@ msg: "The `password` variable needs to be provided to this playbook, via --extra-vars" when: "password is not defined or password == ''" +- name: Fail if playbook called incorrectly + ansible.builtin.fail: + msg: "The `admin` variable needs to be provided to this playbook, via --extra-vars" + when: "admin is not defined or admin not in ['yes', 'no']" + - name: Ensure matrix-dendrite is started ansible.builtin.service: name: matrix-dendrite @@ -23,6 +28,6 @@ - name: Register user ansible.builtin.command: - cmd: "{{ matrix_local_bin_path }}/matrix-dendrite-create-account {{ username | quote }} {{ password | quote }}" + cmd: "{{ matrix_local_bin_path }}/matrix-dendrite-create-account {{ username | quote }} {{ password | quote }} {{ '1' if admin == 'yes' else '0' }}" register: matrix_dendrite_register_user_result changed_when: matrix_dendrite_register_user_result.rc == 0 From 9f0f21cf30b1dc2ef34ae4751dd1c0abb9797b48 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 26 Aug 2022 12:21:38 +0300 Subject: [PATCH 2/2] Pass --no-update to mautrix-discord Possibly fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2060 --- .../templates/systemd/matrix-mautrix-discord.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/matrix-bridge-mautrix-discord/templates/systemd/matrix-mautrix-discord.service.j2 b/roles/matrix-bridge-mautrix-discord/templates/systemd/matrix-mautrix-discord.service.j2 index 788cd0124..3651840eb 100644 --- a/roles/matrix-bridge-mautrix-discord/templates/systemd/matrix-mautrix-discord.service.j2 +++ b/roles/matrix-bridge-mautrix-discord/templates/systemd/matrix-mautrix-discord.service.j2 @@ -31,7 +31,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-mautrix-discor {{ arg }} \ {% endfor %} {{ matrix_mautrix_discord_docker_image }} \ - /usr/bin/mautrix-discord -c /config/config.yaml -r /config/registration.yaml + /usr/bin/mautrix-discord -c /config/config.yaml -r /config/registration.yaml --no-update ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-mautrix-discord 2>/dev/null || true' ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-mautrix-discord 2>/dev/null || true'