Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor php-fpm pool wiring to shared phpPackage option

Browse Source 
Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/13105350-82a0-4135-b8a4-55016f202195

Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-17 13:07:25 +00:00
committed by GitHub
parent 5324344eed
commit 539ede00cb
3 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/nextcloud.nix
View File

@@ -257,14 +257,13 @@ CREDS
"d /var/lib/nextcloud 0770 caddy php -" "d /var/lib/nextcloud 0770 caddy php -"
]; ];
services.phpfpm.pools.mypool.phpOptions = lib.mkAfter ''
output_buffering = 0
'';
services.phpfpm.pools.nextcloud = { services.phpfpm.pools.nextcloud = {
user = "caddy"; user = "caddy";
group = "php"; group = "php";
phpPackage = config.services.phpfpm.pools.mypool.phpPackage; phpPackage = config.sovran_systemsOS.phpPackage;
phpOptions = lib.mkAfter ''
output_buffering = 0
'';
settings = { settings = {
"pm" = "dynamic"; "pm" = "dynamic";
"pm.max_children" = 75; "pm.max_children" = 75;

51
modules/php.nix
View File

@@ -28,39 +28,30 @@ let
}; };
in in
{ {
users.users = { options.sovran_systemsOS.phpPackage = lib.mkOption {
type = lib.types.package;
php = { default = custom-php;
isSystemUser = true; description = "Shared PHP package with all extensions for Sovran_SystemsOS services";
createHome = false;
uid = 7777;
};
}; };
users.users.php.group = "php"; config = {
users.users = {
users.groups.php = {};
environment.systemPackages = with pkgs; [ php = {
isSystemUser = true;
custom-php createHome = false;
]; uid = 7777;
services.phpfpm.pools = {
mypool = {
user = "caddy";
group = "php";
phpPackage = custom-php;
settings = {
"pm" = "dynamic";
"pm.max_children" = 75;
"pm.start_servers" = 10;
"pm.min_spare_servers" = 5;
"pm.max_spare_servers" = 20;
"pm.max_requests" = 500;
"clear_env" = "no";
}; };
}; };
users.users.php.group = "php";
users.groups.php = {};
environment.systemPackages = with pkgs; [
custom-php
];
}; };
} }

2
modules/wordpress.nix
View File

@@ -213,7 +213,7 @@ CREDS
services.phpfpm.pools.wordpress = { services.phpfpm.pools.wordpress = {
user = "caddy"; user = "caddy";
group = "php"; group = "php";
phpPackage = config.services.phpfpm.pools.mypool.phpPackage; phpPackage = config.sovran_systemsOS.phpPackage;
settings = { settings = {
"pm" = "dynamic"; "pm" = "dynamic";
"pm.max_children" = 75; "pm.max_children" = 75;