diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2021-12-11 20:57:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-11 20:57:15 +0000 |
| commit | 57f7f3a87b145c92adf802d8b75b725f5426cb95 (patch) | |
| tree | bf6499fd6fab0fe546fabd9e5a69efe463efd4c1 /nixos/modules | |
| parent | 561ad58a0c0e7b35ac13d5998591749b7de391c8 (diff) | |
| parent | 0eaecd60cb90f6c7247751cee304476869a72fd1 (diff) | |
| download | nixpkgs-57f7f3a87b145c92adf802d8b75b725f5426cb95.tar nixpkgs-57f7f3a87b145c92adf802d8b75b725f5426cb95.tar.gz nixpkgs-57f7f3a87b145c92adf802d8b75b725f5426cb95.tar.bz2 nixpkgs-57f7f3a87b145c92adf802d8b75b725f5426cb95.tar.lz nixpkgs-57f7f3a87b145c92adf802d8b75b725f5426cb95.tar.xz nixpkgs-57f7f3a87b145c92adf802d8b75b725f5426cb95.tar.zst nixpkgs-57f7f3a87b145c92adf802d8b75b725f5426cb95.zip | |
Merge pull request #148696 from MasseR/master
Fix the syntax error on tt-rss config file
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/web-apps/tt-rss.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 08356cee1df..9aa38ab25c9 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -18,11 +18,11 @@ let tt-rss-config = let password = if (cfg.database.password != null) then - "${(escape ["'" "\\"] cfg.database.password)}" + "'${(escape ["'" "\\"] cfg.database.password)}'" else if (cfg.database.passwordFile != null) then - "file_get_contents('${cfg.database.passwordFile}'" + "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}'); |