From 539ede00cbf36c4daca5d2a99032d3cf47c58bf6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 17 Apr 2026 13:07:25 +0000
Subject: [PATCH] refactor php-fpm pool wiring to shared phpPackage option

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>
---
 modules/nextcloud.nix |  9 ++++----
 modules/php.nix       | 51 ++++++++++++++++++-------------------------
 modules/wordpress.nix |  2 +-
 3 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix
index f3c995d..0b7d146 100755
--- a/modules/nextcloud.nix
+++ b/modules/nextcloud.nix
@@ -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;
diff --git a/modules/php.nix b/modules/php.nix
index f432c0f..7e818b6 100755
--- a/modules/php.nix
+++ b/modules/php.nix
@@ -28,39 +28,30 @@ let
 	};
 in
 
-{	
-	users.users = {
-
-		php = {
-			isSystemUser = true;
-			createHome = false;
-			uid = 7777;
-		};
+{
+	options.sovran_systemsOS.phpPackage = lib.mkOption {
+		type = lib.types.package;
+		default = custom-php;
+		description = "Shared PHP package with all extensions for Sovran_SystemsOS services";
 	};
 
-	users.users.php.group = "php";
-	
-	users.groups.php = {};
+	config = {
+		users.users = {
 
-	environment.systemPackages = with pkgs; [
-		
-		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";
+			php = {
+				isSystemUser = true;
+				createHome = false;
+				uid = 7777;
 			};
-		};			
+		};
+
+		users.users.php.group = "php";
+		
+		users.groups.php = {};
+
+		environment.systemPackages = with pkgs; [
+			
+			custom-php
+		];
 	};
 }
diff --git a/modules/wordpress.nix b/modules/wordpress.nix
index ae24e84..1f97fa6 100755
--- a/modules/wordpress.nix
+++ b/modules/wordpress.nix
@@ -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;