Merge pull request #289961 from leona-ya/vikunja-0.23.0

vikunja: 0.22.1 -> 0.23.0
This commit is contained in:
Martin Weinelt
2024-03-03 19:15:35 +01:00
committed by GitHub
8 changed files with 200 additions and 142 deletions

View File

@@ -13,15 +13,20 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
frontendScheme = "http";
frontendHostname = "localhost";
};
services.nginx.enable = true;
services.nginx = {
enable = true;
virtualHosts."http://localhost" = {
locations."/".proxyPass = "http://localhost:3456";
};
};
};
vikunjaPostgresql = { pkgs, ... }: {
services.vikunja = {
enable = true;
database = {
type = "postgres";
user = "vikunja-api";
database = "vikunja-api";
user = "vikunja";
database = "vikunja";
host = "/run/postgresql";
};
frontendScheme = "http";
@@ -30,20 +35,25 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
};
services.postgresql = {
enable = true;
ensureDatabases = [ "vikunja-api" ];
ensureDatabases = [ "vikunja" ];
ensureUsers = [
{ name = "vikunja-api";
{ name = "vikunja";
ensureDBOwnership = true;
}
];
};
services.nginx.enable = true;
services.nginx = {
enable = true;
virtualHosts."http://localhost" = {
locations."/".proxyPass = "http://localhost:9090";
};
};
};
};
testScript =
''
vikunjaSqlite.wait_for_unit("vikunja-api.service")
vikunjaSqlite.wait_for_unit("vikunja.service")
vikunjaSqlite.wait_for_open_port(3456)
vikunjaSqlite.succeed("curl --fail http://localhost:3456/api/v1/info")
@@ -52,7 +62,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
vikunjaSqlite.succeed("curl --fail http://localhost/api/v1/info")
vikunjaSqlite.succeed("curl --fail http://localhost")
vikunjaPostgresql.wait_for_unit("vikunja-api.service")
vikunjaPostgresql.wait_for_unit("vikunja.service")
vikunjaPostgresql.wait_for_open_port(9090)
vikunjaPostgresql.succeed("curl --fail http://localhost:9090/api/v1/info")