movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/wakapi: fix logical error in warning; minor grammatical improvements (#375021)

Browse source
This commit is contained in:
Tristan Ross 2025-02-04 12:42:14 -08:00 • committed by GitHub
commit 5d9b653219
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/web-apps/wakapi.nix
View file

@ -193,11 +193,11 @@ in
}
{
assertion = !(cfg.passwordSalt != null && cfg.passwordSaltFile != null);
message = "Both `services.wakapi.passwordSalt` `services.wakapi.passwordSaltFile` should not be set at the same time.";
message = "Both `services.wakapi.passwordSalt` and `services.wakapi.passwordSaltFile` should not be set at the same time.";
}
{
assertion = !(cfg.smtpPassword != null && cfg.smtpPasswordFile != null);
message = "Both `services.wakapi.smtpPassword` `services.wakapi.smtpPasswordFile` should not be set at the same time.";
message = "Both `services.wakapi.smtpPassword` and `services.wakapi.smtpPasswordFile` should not be set at the same time.";
}
{
assertion = cfg.database.createLocally -> cfg.settings.db.dialect != null;
@ -206,10 +206,10 @@ in
];
warnings = [
(lib.optionalString (cfg.database.createLocally -> cfg.settings.db.dialect != "postgres") ''
(lib.optionalString (cfg.database.createLocally && cfg.settings.db.dialect != "postgres") ''
You have enabled automatic database configuration, but the database dialect is not set to "posgres".
The Wakapi module only supports for PostgreSQL. Please set `services.wakapi.database.createLocally`
The Wakapi module only supports PostgreSQL. Please set `services.wakapi.database.createLocally`
to `false`, or switch to "postgres" as your database dialect.
'')
];