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

[WIP] Clean up PHP-FPM pool architecture and expose custom PHP properly

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;

modules/php.nix

@@ -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";
-			};
-		};			
 	};
 }

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;