From eafd39c605698379eda195e3ee571ead9a10c3ee Mon Sep 17 00:00:00 2001 From: Zebreus Date: Mon, 1 Apr 2024 22:18:43 +0200 Subject: [PATCH 1/2] nixos/redmine: Fix broken assertion with sqlite3 database Somehow this was missed while working on commit ddd15dc2d9. So make the assertion working when SQLite is used. --- nixos/modules/services/misc/redmine.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 957571944b28..8ebc46b42dcc 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -276,8 +276,8 @@ in { assertion = pgsqlLocal -> cfg.database.user == cfg.database.name; message = "services.redmine.database.user and services.redmine.database.name must be the same when using a local postgresql database"; } - { assertion = cfg.database.createLocally -> cfg.database.type != "sqlite3" && cfg.database.socket != null; - message = "services.redmine.database.socket must be set if services.redmine.database.createLocally is set to true"; + { assertion = (cfg.database.createLocally && cfg.database.type != "sqlite3") -> cfg.database.socket != null; + message = "services.redmine.database.socket must be set if services.redmine.database.createLocally is set to true and no sqlite database is used"; } { assertion = cfg.database.createLocally -> cfg.database.host == "localhost"; message = "services.redmine.database.host must be set to localhost if services.redmine.database.createLocally is set to true"; From 7245e78e2da39e3195d77f53ad84d16353300a4a Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 2 Apr 2024 00:20:19 +0200 Subject: [PATCH 2/2] nixos/tests/redmine: Add test case for SQLite backend Suggested-by: Zebreus Signed-off-by: Felix Singer --- nixos/tests/redmine.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index 621b3e6a36ee..16fb2e2c64a6 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -39,6 +39,7 @@ let meta.maintainers = [ maintainers.aanderse ]; }; in { + sqlite3 = redmineTest { name = "sqlite3"; type = "sqlite3"; }; mysql = redmineTest { name = "mysql"; type = "mysql2"; }; pgsql = redmineTest { name = "pgsql"; type = "postgresql"; }; }