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

Merge pull request #270 from naturallaw777/copilot/remove-orphaned-mypool

Browse Source 
[WIP] Clean up PHP-FPM pool architecture and expose custom PHP properly
This commit is contained in:
Sovran_Systems
2026-04-17 08:08:29 -05:00
committed by GitHub
parent d2c9dd1fbd 539ede00cb
commit 42305f7f22
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 -"
];
services.phpfpm.pools.mypool.phpOptions = lib.mkAfter ''
output_buffering = 0
'';
services.phpfpm.pools.nextcloud = {
user = "caddy";
group = "php";
phpPackage = config.services.phpfpm.pools.mypool.phpPackage;
phpPackage = config.sovran_systemsOS.phpPackage;
phpOptions = lib.mkAfter ''
output_buffering = 0
'';
settings = {
"pm" = "dynamic";
"pm.max_children" = 75;

23
modules/php.nix
View File

@@ -29,6 +29,13 @@ let
in
{
options.sovran_systemsOS.phpPackage = lib.mkOption {
type = lib.types.package;
default = custom-php;
description = "Shared PHP package with all extensions for Sovran_SystemsOS services";
};
config = {
users.users = {
php = {
@@ -46,21 +53,5 @@ in
custom-php
];
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";
};
};
};
}

2
modules/wordpress.nix
View File

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