mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 20:25:32 +03:00
nixos/monica: add phpPackage option and pass it to phpfpm pool
fixes nixosTests.monica failure
This commit is contained in:
parent
4ad504735a
commit
1db72d9afc
1 changed files with 4 additions and 1 deletions
|
@ -16,7 +16,7 @@ let
|
|||
user = cfg.user;
|
||||
group = cfg.group;
|
||||
|
||||
php = lib.getExe pkgs.php83;
|
||||
php = lib.getExe cfg.phpPackage;
|
||||
|
||||
# shell script for local administration
|
||||
artisan = pkgs.writeScriptBin "monica" ''
|
||||
|
@ -38,6 +38,8 @@ in
|
|||
options.services.monica = {
|
||||
enable = mkEnableOption "monica";
|
||||
|
||||
phpPackage = mkPackageOption pkgs "php83" { };
|
||||
|
||||
user = mkOption {
|
||||
default = "monica";
|
||||
description = "User monica runs as.";
|
||||
|
@ -342,6 +344,7 @@ in
|
|||
|
||||
services.phpfpm.pools.monica = {
|
||||
inherit user group;
|
||||
phpPackage = cfg.phpPackage;
|
||||
phpOptions = ''
|
||||
log_errors = on
|
||||
post_max_size = ${cfg.maxUploadSize}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue