BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #178838 from mweinelt/matrix-appservice-irc

Browse source 
nixos/matrix-appservice-irc: wait for postgres to start
This commit is contained in:
piegames 2022-06-25 23:09:36 +02:00 committed by GitHub
commit aa3641fa90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/matrix/appservice-irc.nix
View file

@ -153,6 +153,9 @@ in {
systemd.services.matrix-appservice-irc = { systemd.services.matrix-appservice-irc = {
description = "Matrix-IRC bridge"; description = "Matrix-IRC bridge";
before = [ "matrix-synapse.service" ]; # So the registration can be used by Synapse 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" ]; wantedBy = [ "multi-user.target" ];
preStart = '' preStart = ''

3
nixos/tests/matrix/appservice-irc.nix
View file

@ -193,6 +193,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
testScript = '' testScript = ''
import pathlib import pathlib
import os
start_all() start_all()
@ -206,7 +207,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
with subtest("copy the registration file"): with subtest("copy the registration file"):
appservice.copy_from_vm("/var/lib/matrix-appservice-irc/registration.yml") appservice.copy_from_vm("/var/lib/matrix-appservice-irc/registration.yml")
homeserver.copy_from_host( 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") homeserver.succeed("chmod 444 /registration.yml")