From 6290926feddb4a960614fc56ebf649c8bea1de39 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 8 Oct 2024 20:23:52 +0200 Subject: [PATCH] nixos/freshrss: fix phpfpm.pool --- nixos/modules/services/web-apps/freshrss.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 9a6556676597..8150f20c2a47 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -4,8 +4,6 @@ with lib; let cfg = config.services.freshrss; - poolName = "freshrss"; - extension-env = pkgs.buildEnv { name = "freshrss-extensions"; paths = cfg.extensions; @@ -141,8 +139,8 @@ in }; pool = mkOption { - type = types.str; - default = poolName; + type = types.nullOr types.str; + default = "freshrss"; description = '' Name of the php-fpm pool to use and setup. If not specified, a pool will be created with default values. @@ -235,8 +233,8 @@ in }; # Set up phpfpm pool - services.phpfpm.pools = mkIf (cfg.pool == poolName) { - ${poolName} = { + services.phpfpm.pools = mkIf (cfg.pool != null) { + ${cfg.pool} = { user = "freshrss"; settings = { "listen.owner" = "nginx";