diff options
| author | Mats Rauhala <mats.rauhala@iki.fi> | 2021-12-11 15:01:15 +0200 |
|---|---|---|
| committer | Mats Rauhala <mats.rauhala@iki.fi> | 2021-12-11 15:02:27 +0200 |
| commit | 0eaecd60cb90f6c7247751cee304476869a72fd1 (patch) | |
| tree | eb41b23918f4873369bf4c8b9c82d5970829923b | |
| parent | de16da59f269861f40e35035d917954c31901263 (diff) | |
| download | nixpkgs-0eaecd60cb90f6c7247751cee304476869a72fd1.tar nixpkgs-0eaecd60cb90f6c7247751cee304476869a72fd1.tar.gz nixpkgs-0eaecd60cb90f6c7247751cee304476869a72fd1.tar.bz2 nixpkgs-0eaecd60cb90f6c7247751cee304476869a72fd1.tar.lz nixpkgs-0eaecd60cb90f6c7247751cee304476869a72fd1.tar.xz nixpkgs-0eaecd60cb90f6c7247751cee304476869a72fd1.tar.zst nixpkgs-0eaecd60cb90f6c7247751cee304476869a72fd1.zip | |
tt-rss-module handle situations without any password
| -rw-r--r-- | nixos/modules/services/web-apps/tt-rss.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 97a6a8d3f6c..9aa38ab25c9 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -22,7 +22,7 @@ let else if (cfg.database.passwordFile != null) then "file_get_contents('${cfg.database.passwordFile}')" else - "" + null ; in pkgs.writeText "config.php" '' <?php @@ -40,7 +40,7 @@ let putenv('TTRSS_DB_HOST=${optionalString (cfg.database.host != null) cfg.database.host}'); putenv('TTRSS_DB_USER=${cfg.database.user}'); putenv('TTRSS_DB_NAME=${cfg.database.name}'); - putenv('TTRSS_DB_PASS=' . ${password}); + putenv('TTRSS_DB_PASS=' ${optionalString (password != null) ". ${password}"}); putenv('TTRSS_DB_PORT=${toString dbPort}'); putenv('TTRSS_AUTH_AUTO_CREATE=${boolToString cfg.auth.autoCreate}'); |