From f9026469cde3da1b1e860dc88f1b298bdf951b62 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 4 Aug 2022 08:53:46 +0000 Subject: [PATCH 1/2] Add back sqlite plugin database config option --- roles/matrix-bot-maubot/templates/config/config.yaml.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/matrix-bot-maubot/templates/config/config.yaml.j2 b/roles/matrix-bot-maubot/templates/config/config.yaml.j2 index 938901eab..49bbcb878 100644 --- a/roles/matrix-bot-maubot/templates/config/config.yaml.j2 +++ b/roles/matrix-bot-maubot/templates/config/config.yaml.j2 @@ -27,6 +27,9 @@ plugin_directories: # Configuration for storing plugin databases plugin_databases: + # Some plugins still require sqlite, so configure a path here. + # postgres will be used if supported. + sqlite: /data/dbs postgres: default server: From 309a2393c3dc37b5d07c63af65a909567e003c75 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Thu, 4 Aug 2022 09:18:12 +0000 Subject: [PATCH 2/2] Add no update flag as our config is read only --- .../templates/systemd/matrix-bot-maubot.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2 b/roles/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2 index 2773c69db..c4cbcb388 100644 --- a/roles/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2 +++ b/roles/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2 @@ -31,7 +31,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-bot-maubot \ -p {{ matrix_bot_maubot_management_interface_http_bind_port }}:{{ matrix_bot_maubot_management_interface_port }} {% endif %} {{ matrix_bot_maubot_docker_image }} \ - python3 -m maubot -c /config/config.yaml + python3 -m maubot -c /config/config.yaml --no-update ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-bot-maubot 2>/dev/null || true' ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-bot-maubot 2>/dev/null || true'