movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-14 13:39:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/wakapi: don't merge EnvironmentFile paths

Browse source
This commit is contained in:
NotAShelf 2024-12-08 16:05:11 +03:00
parent 0c53b7c1c8
commit a8537d1198
No known key found for this signature in database
GPG key ID: AF26552424E53993
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

@ -142,10 +142,10 @@ in
(mkIf (cfg.passwordSalt != null) "WAKAPI_PASSWORD_SALT=${cfg.passwordSalt}") (mkIf (cfg.passwordSalt != null) "WAKAPI_PASSWORD_SALT=${cfg.passwordSalt}")
(mkIf (cfg.smtpPassword != null) "WAKAPI_MAIL_SMTP_PASS=${cfg.smtpPassword}") (mkIf (cfg.smtpPassword != null) "WAKAPI_MAIL_SMTP_PASS=${cfg.smtpPassword}")
]; ];
EnvironmentFile = [
(optional (cfg.passwordSaltFile != null) cfg.passwordSaltFile) EnvironmentFile =
(optional (cfg.smtpPasswordFile != null) cfg.smtpPasswordFile) (lib.optional (cfg.passwordSaltFile != null) cfg.passwordSaltFile)
]; ++ (lib.optional (cfg.smtpPasswordFile != null) cfg.smtpPasswordFile);
User = config.users.users.wakapi.name; User = config.users.users.wakapi.name;
Group = config.users.users.wakapi.group; Group = config.users.users.wakapi.group;