doradus/bookwyrm
2
0
Fork 0
Code Activity

nix module: make database.password not get into infinite recursion

Browse source
This commit is contained in:
D Anzorge 2021-04-13 03:16:12 +02:00
parent e685bd4374
commit f9be9c71cc
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nix/module.nix
View file

@ -291,7 +291,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
warnings = warnings =
(optional (cfg.secretKey != "") "config.services.bookwyrm.secretKey will be stored in plain text in the Nix store, where it will be world readable. To avoid this, consider using config.services.bookwyrm.secretKeyFile instead.") (optional (cfg.secretKey != "") "config.services.bookwyrm.secretKey will be stored in plain text in the Nix store, where it will be world readable. To avoid this, consider using config.services.bookwyrm.secretKeyFile instead.")
++ (optional (cfg.database.password != "" && cfg.database.passwordFile == null) "config.services.bookwyrm.database.password will be stored in plain text in the Nix store, where it will be world readable. To avoid this, consider using config.services.bookwyrm.database.passwordFile instead.") ++ (optional (cfg.database.password != "") "config.services.bookwyrm.database.password will be stored in plain text in the Nix store, where it will be world readable. To avoid this, consider using config.services.bookwyrm.database.passwordFile instead.")
++ (optional (cfg.email.password != "") "config.services.bookwyrm.email.password will be stored in plain text in the Nix store, where it will be world readable. To avoid this, consider using config.services.bookwyrm.email.passwordFile instead."); ++ (optional (cfg.email.password != "") "config.services.bookwyrm.email.password will be stored in plain text in the Nix store, where it will be world readable. To avoid this, consider using config.services.bookwyrm.email.passwordFile instead.");
assertions = [ assertions = [
@ -310,12 +310,10 @@ in
}))); })));
services.bookwyrm.database.passwordFile = services.bookwyrm.database.passwordFile =
if cfg.database.password != "" && cfg.database.passwordFile == null then (mkDefault (toString (pkgs.writeTextFile {
(toString (pkgs.writeTextFile {
name = "bookwyrm-secretkeyfile"; name = "bookwyrm-secretkeyfile";
text = cfg.database.password; text = cfg.database.password;
})) })));
else null;
services.bookwyrm.email.passwordFile = services.bookwyrm.email.passwordFile =
(mkDefault (toString (pkgs.writeTextFile { (mkDefault (toString (pkgs.writeTextFile {