From 7e1e7da5abe29ae4c7a28ee0d90a248ffc1e9db2 Mon Sep 17 00:00:00 2001 From: Scott Crossen Date: Sun, 22 Nov 2020 13:55:19 -0800 Subject: [PATCH] Fix issues with mautrix dbs on resource-contrained systems --- .../templates/systemd/matrix-mautrix-facebook.service.j2 | 4 ++++ .../templates/systemd/matrix-mautrix-hangouts.service.j2 | 4 ++++ .../templates/systemd/matrix-mautrix-telegram.service.j2 | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/roles/matrix-bridge-mautrix-facebook/templates/systemd/matrix-mautrix-facebook.service.j2 b/roles/matrix-bridge-mautrix-facebook/templates/systemd/matrix-mautrix-facebook.service.j2 index b593a2e35..b17f85407 100644 --- a/roles/matrix-bridge-mautrix-facebook/templates/systemd/matrix-mautrix-facebook.service.j2 +++ b/roles/matrix-bridge-mautrix-facebook/templates/systemd/matrix-mautrix-facebook.service.j2 @@ -13,6 +13,10 @@ Wants={{ service }} Type=simple ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-mautrix-facebook ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-mautrix-facebook +ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-mautrix-facebook-db +ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-mautrix-facebook-db +ExecStartPre=-{{ matrix_host_command_docker }} rm --force matrix-mautrix-facebook-db +ExecStartPre=-{{ matrix_host_command_docker }} network disconnect -f bridge matrix-mautrix-facebook-db ExecStartPre={{ matrix_host_command_docker }} run --rm --name matrix-mautrix-facebook-db \ --log-driver=none \ --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ diff --git a/roles/matrix-bridge-mautrix-hangouts/templates/systemd/matrix-mautrix-hangouts.service.j2 b/roles/matrix-bridge-mautrix-hangouts/templates/systemd/matrix-mautrix-hangouts.service.j2 index 584339820..7b7df9044 100644 --- a/roles/matrix-bridge-mautrix-hangouts/templates/systemd/matrix-mautrix-hangouts.service.j2 +++ b/roles/matrix-bridge-mautrix-hangouts/templates/systemd/matrix-mautrix-hangouts.service.j2 @@ -13,6 +13,10 @@ Wants={{ service }} Type=simple ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-mautrix-hangouts matrix-mautrix-hangouts-db ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-mautrix-hangouts matrix-mautrix-hangouts-db +ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-mautrix-hangouts-db +ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-mautrix-hangouts-db +ExecStartPre=-{{ matrix_host_command_docker }} rm --force matrix-mautrix-hangouts-db +ExecStartPre=-{{ matrix_host_command_docker }} network disconnect -f bridge matrix-mautrix-hangouts-db ExecStartPre={{ matrix_host_command_docker }} run --rm --name matrix-mautrix-hangouts-db \ --log-driver=none \ --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \ diff --git a/roles/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2 b/roles/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2 index c0fb89381..a46e093d2 100644 --- a/roles/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2 +++ b/roles/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2 @@ -13,6 +13,10 @@ Wants={{ service }} Type=simple ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-mautrix-telegram ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-mautrix-telegram +ExecStartPre=-{{ matrix_host_command_docker }} kill matrix-mautrix-telegram-db +ExecStartPre=-{{ matrix_host_command_docker }} rm matrix-mautrix-telegram-db +ExecStartPre=-{{ matrix_host_command_docker }} rm --force matrix-mautrix-telegram-db +ExecStartPre=-{{ matrix_host_command_docker }} network disconnect -f {{ matrix_docker_network }} matrix-mautrix-telegram-db ExecStartPre={{ matrix_host_command_docker }} run --rm --name matrix-mautrix-telegram-db \ --log-driver=none \ --user={{ matrix_user_uid }}:{{ matrix_user_gid }} \