From 6c1f44b3f17fc2a4610d4565ea609b8cf5bfe8d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 24 Jun 2022 08:37:43 +0200 Subject: [PATCH 1/2] nixos/matrix-appservice-irc: wait for postgres to start Closes: #178692 --- nixos/modules/services/matrix/appservice-irc.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/matrix/appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix index b041c9c82c5..ff938527ed5 100644 --- a/nixos/modules/services/matrix/appservice-irc.nix +++ b/nixos/modules/services/matrix/appservice-irc.nix @@ -153,6 +153,9 @@ in { systemd.services.matrix-appservice-irc = { description = "Matrix-IRC bridge"; before = [ "matrix-synapse.service" ]; # So the registration can be used by Synapse + after = lib.optionals (cfg.settings.database.engine == "postgres") [ + "postgresql.service" + ]; wantedBy = [ "multi-user.target" ]; preStart = '' From e215af71134261d31d9ff175999bfa051847bb48 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 24 Jun 2022 08:52:46 +0200 Subject: [PATCH 2/2] nixos/tests/matrix-appservice-irc: fix typing mismatch --- nixos/tests/matrix/appservice-irc.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/matrix/appservice-irc.nix b/nixos/tests/matrix/appservice-irc.nix index 7dd44da8305..78c53024ca6 100644 --- a/nixos/tests/matrix/appservice-irc.nix +++ b/nixos/tests/matrix/appservice-irc.nix @@ -193,6 +193,7 @@ import ../make-test-python.nix ({ pkgs, ... }: testScript = '' import pathlib + import os start_all() @@ -206,7 +207,7 @@ import ../make-test-python.nix ({ pkgs, ... }: with subtest("copy the registration file"): appservice.copy_from_vm("/var/lib/matrix-appservice-irc/registration.yml") homeserver.copy_from_host( - pathlib.Path(os.environ.get("out", os.getcwd())) / "registration.yml", "/" + str(pathlib.Path(os.environ.get("out", os.getcwd())) / "registration.yml"), "/" ) homeserver.succeed("chmod 444 /registration.yml")