movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/monica: add phpPackage option and pass it to phpfpm pool

Browse source 
fixes nixosTests.monica failure
This commit is contained in:
Piotr Kwiecinski 2025-04-03 15:17:09 +02:00
parent 4ad504735a
commit 1db72d9afc
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/services/web-apps/monica.nix
View file

@ -16,7 +16,7 @@ let
user = cfg.user; user = cfg.user;
group = cfg.group; group = cfg.group;
php = lib.getExe pkgs.php83; php = lib.getExe cfg.phpPackage;
# shell script for local administration # shell script for local administration
artisan = pkgs.writeScriptBin "monica" '' artisan = pkgs.writeScriptBin "monica" ''
@ -38,6 +38,8 @@ in
options.services.monica = { options.services.monica = {
enable = mkEnableOption "monica"; enable = mkEnableOption "monica";
phpPackage = mkPackageOption pkgs "php83" { };
user = mkOption { user = mkOption {
default = "monica"; default = "monica";
description = "User monica runs as."; description = "User monica runs as.";
@ -342,6 +344,7 @@ in
services.phpfpm.pools.monica = { services.phpfpm.pools.monica = {
inherit user group; inherit user group;
phpPackage = cfg.phpPackage;
phpOptions = '' phpOptions = ''
log_errors = on log_errors = on
post_max_size = ${cfg.maxUploadSize} post_max_size = ${cfg.maxUploadSize}