From 38e542c184115ddc0a1230b28380c7ecbafd1bc0 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sat, 13 Nov 2021 16:21:24 +0100
Subject: [PATCH] php prformance tweaks

---
 bundles/php/files/php.ini |  9 +++++++++
 bundles/php/metadata.py   | 36 ++++++++++++++++++++++++------------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/bundles/php/files/php.ini b/bundles/php/files/php.ini
index 6c68edc..0e1f316 100644
--- a/bundles/php/files/php.ini
+++ b/bundles/php/files/php.ini
@@ -100,3 +100,12 @@ zend.assertions = -1
 
 [Date]
 date.timezone = Europe/London
+
+[opcache]
+opcache.enable = 1
+opcache.interned_strings_buffer = 32
+opcache.max_accelerated_files = 20000
+opcache.memory_consumption = 1024
+opcache.save_comments = 1
+opcache.validate_timestamps = 1
+opcache.revalidate_freq = 60
diff --git a/bundles/php/metadata.py b/bundles/php/metadata.py
index 859ca5c..3aa317d 100644
--- a/bundles/php/metadata.py
+++ b/bundles/php/metadata.py
@@ -1,22 +1,34 @@
 defaults = {
     'php': {
         'post_max_size': '32G',
-        'www.conf': {
-            'user': 'www-data',
-            'group': 'www-data',
-            'listen': '/run/php/php7.4-fpm.sock',
-            'listen.owner': 'www-data',
-            'listen.group': 'www-data',
-            'pm': 'dynamic',
-            'pm.max_children': '5',
-            'pm.start_servers': '2',
-            'pm.min_spare_servers': '1',
-            'pm.max_spare_servers': '3',
-        },
     },
 }
 
 
+@metadata_reactor.provides(
+    'php/www.conf',
+)
+def www_conf(metadata):
+    version = metadata.get('php/version')
+    return {
+        'php': {
+            'www.conf': {
+                'user': 'www-data',
+                'group': 'www-data',
+                'listen': f'/run/php/php{version}-fpm.sock',
+                'listen.owner': 'www-data',
+                'listen.group': 'www-data',
+                'pm': 'dynamic',
+                'pm.max_children': '80',
+                'pm.start_servers': '20',
+                'pm.min_spare_servers': '20',
+                'pm.max_spare_servers': '30',
+                'pm.max_requests': '500',
+            },
+        },
+    }
+
+
 @metadata_reactor.provides(
     'apt/packages',
 )