Skip to content

Commit e544a67

Browse files
authored
nixos/freshrss: fix phpfpm.pool (#347324)
2 parents e233795 + de810c5 commit e544a67

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

nixos/modules/services/web-apps/freshrss.nix

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ with lib;
44
let
55
cfg = config.services.freshrss;
66

7-
poolName = "freshrss";
8-
97
extension-env = pkgs.buildEnv {
108
name = "freshrss-extensions";
119
paths = cfg.extensions;
@@ -141,8 +139,8 @@ in
141139
};
142140

143141
pool = mkOption {
144-
type = types.str;
145-
default = poolName;
142+
type = types.nullOr types.str;
143+
default = "freshrss";
146144
description = ''
147145
Name of the php-fpm pool to use and setup. If not specified, a pool will be created
148146
with default values.
@@ -235,8 +233,8 @@ in
235233
};
236234

237235
# Set up phpfpm pool
238-
services.phpfpm.pools = mkIf (cfg.pool == poolName) {
239-
${poolName} = {
236+
services.phpfpm.pools = mkIf (cfg.pool != null) {
237+
${cfg.pool} = {
240238
user = "freshrss";
241239
settings = {
242240
"listen.owner" = "nginx";
@@ -271,9 +269,9 @@ in
271269
let
272270
settingsFlags = concatStringsSep " \\\n "
273271
(mapAttrsToList (k: v: "${k} ${toString v}") {
274-
"--default_user" = ''"${cfg.defaultUser}"'';
275-
"--auth_type" = ''"${cfg.authType}"'';
276-
"--base_url" = ''"${cfg.baseUrl}"'';
272+
"--default-user" = ''"${cfg.defaultUser}"'';
273+
"--auth-type" = ''"${cfg.authType}"'';
274+
"--base-url" = ''"${cfg.baseUrl}"'';
277275
"--language" = ''"${cfg.language}"'';
278276
"--db-type" = ''"${cfg.database.type}"'';
279277
# The following attributes are optional depending on the type of

0 commit comments

Comments
 (0)