From aa6673bacf2f47b6ef4fe7ad6c66ab0edaf2082b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 28 Dec 2025 20:39:50 +0100 Subject: [PATCH] nixos/freshrss: improve script generation --- nixos/modules/services/web-apps/freshrss.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 758807b3c9b8..2544bd846424 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -357,15 +357,15 @@ in script = let + isUserAuth = cfg.authType == "form" || cfg.authType == "none"; + userScriptArgs = ''--user ${cfg.defaultUser} ${ optionalString (cfg.authType == "form") ''--password "$(cat ${cfg.passwordFile})"'' }''; - updateUserScript = optionalString (cfg.authType == "form" || cfg.authType == "none") '' - ./cli/update-user.php ${userScriptArgs} - ''; - createUserScript = optionalString (cfg.authType == "form" || cfg.authType == "none") '' - ./cli/create-user.php ${userScriptArgs} - ''; + mkUserScript = name: optionalString isUserAuth ''./cli/${name}.php ${userScriptArgs}''; + + updateUserScript = mkUserScript "update-user"; + createUserScript = mkUserScript "create-user"; in '' # do installation or reconfigure