JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nextcloud: fix deprecation warning

Browse Source
This commit is contained in:
Averell Dalton 2019-09-10 19:33:00 +02:00
parent dad77d59cb
commit 56e5dddf7c
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -120,16 +120,24 @@ in {
''; '';
}; };
poolConfig = mkOption { poolSettings = mkOption {
type = types.lines; type = with types; attrsOf (oneOf [ str int bool ]);
default = '' default = {
pm = dynamic "pm" = "dynamic";
pm.max_children = 32 "pm.max_children" = "32";
pm.start_servers = 2 "pm.start_servers" = "2";
pm.min_spare_servers = 2 "pm.min_spare_servers" = "2";
pm.max_spare_servers = 4 "pm.max_spare_servers" = "4";
pm.max_requests = 500 "pm.max_requests" = "500";
};
description = ''
Options for nextcloud's PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives.
''; '';
};
poolConfig = mkOption {
type = types.nullOr types.lines;
default = null;
description = '' description = ''
Options for nextcloud's PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives. Options for nextcloud's PHP pool. See the documentation on <literal>php-fpm.conf</literal> for details on configuration directives.
''; '';
@ -287,6 +295,11 @@ in {
message = "Please specify exactly one of adminpass or adminpassFile"; message = "Please specify exactly one of adminpass or adminpassFile";
} }
]; ];
warnings = optional (cfg.poolConfig != null) ''
Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release.
Please migrate your configuration to config.services.nextcloud.poolSettings.
'';
} }
{ systemd.timers.nextcloud-cron = { { systemd.timers.nextcloud-cron = {
@ -423,7 +436,7 @@ in {
settings = mapAttrs (name: mkDefault) { settings = mapAttrs (name: mkDefault) {
"listen.owner" = "nginx"; "listen.owner" = "nginx";
"listen.group" = "nginx"; "listen.group" = "nginx";
}; } // cfg.poolSettings;
extraConfig = cfg.poolConfig; extraConfig = cfg.poolConfig;
}; };
}; };