Merge pull request #300805 from felixsinger/pkgs/redmine/fix-assertion

nixos/redmine: Fix broken assertion when SQLite is used

Changed files
+3 -2
nixos
modules
services
tests
+2 -2
nixos/modules/services/misc/redmine.nix
···
{ 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";
+1
nixos/tests/redmine.nix
···
meta.maintainers = [ maintainers.aanderse ];
};
in {
+
sqlite3 = redmineTest { name = "sqlite3"; type = "sqlite3"; };
mysql = redmineTest { name = "mysql"; type = "mysql2"; };
pgsql = redmineTest { name = "pgsql"; type = "postgresql"; };
}