From f3131f89928813318e47b0ac61c1c5bfa3ba89ed Mon Sep 17 00:00:00 2001
From: VirtuBox <contact@virtubox.net>
Date: Thu, 21 Mar 2019 17:27:51 +0100
Subject: [PATCH] fix opcache settings

---
 wo/cli/plugins/site_functions.py |  4 +---
 wo/cli/plugins/stack.py          | 12 +++++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py
index 25db7b0..98e8855 100644
--- a/wo/cli/plugins/site_functions.py
+++ b/wo/cli/plugins/site_functions.py
@@ -314,11 +314,9 @@ def setupwordpress(self, data):
                                             data['wo_db_user'], data['wo_db_host']
                                             )
                                     + "--dbpass=\'{0}\' "
-                                    "--extra-php<<PHP \n {1} {2} {redissalt}\nPHP\""
+                                    "--extra-php<<PHP \n {1} {redissalt}\nPHP\""
                                     .format(data['wo_db_pass'],
                                             "\n\ndefine(\'WP_DEBUG\', false);",
-                                            "\ndefine(\'CONCATENATE_SCRIPTS\',"
-                                            " false);",
                                             redissalt="\n\ndefine( \'WP_CACHE_KEY_SALT\', \'{0}:\' );"
                                                       .format(wo_domain_name) if data['wpredis']
                                                       else ''),
diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index a40add3..a579f10 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -692,9 +692,8 @@ class WOStackController(CementBaseController):
                 config['opcache']['opcache.max_accelerated_files'] = '10000'
                 config['opcache']['opcache.memory_consumption'] = '256'
                 config['opcache']['opcache.save_comments'] = '1'
-                config['opcache']['opcache.revalidate_freq'] = '5'
+                config['opcache']['opcache.revalidate_freq'] = '2'
                 config['opcache']['opcache.validate_timestamps'] = '1'
-                config['opcache']['opcache.consistency_checks'] = '0'
                 with open('/etc/php/7.2/fpm/php.ini',
                           encoding='utf-8', mode='w') as configfile:
                     Log.debug(self, "Writting php configuration into "
@@ -724,12 +723,14 @@ class WOStackController(CementBaseController):
                 config['www']['pm.start_servers'] = '10'
                 config['www']['pm.min_spare_servers'] = '5'
                 config['www']['pm.max_spare_servers'] = '15'
-                config['www']['request_terminate_timeout'] = '100'
+                config['www']['request_terminate_timeout'] = '300'
                 config['www']['pm'] = 'ondemand'
                 config['www']['chdir'] = '/'
                 config['www']['prefix'] = '/var/run/php'
                 config['www']['listen'] = 'php72-fpm.sock'
+                config['www']['listen.mode'] = '0660'
                 config['www']['listen.backlog'] = '32768'
+                config['www']['catch_workers_output'] = 'yes'
                 with codecs.open('/etc/php/7.2/fpm/pool.d/www.conf',
                                  encoding='utf-8', mode='w') as configfile:
                     Log.debug(self, "Writing PHP 7.2 configuration into "
@@ -846,9 +847,8 @@ class WOStackController(CementBaseController):
                 config['opcache']['opcache.max_accelerated_files'] = '10000'
                 config['opcache']['opcache.memory_consumption'] = '256'
                 config['opcache']['opcache.save_comments'] = '1'
-                config['opcache']['opcache.revalidate_freq'] = '5'
+                config['opcache']['opcache.revalidate_freq'] = '2'
                 config['opcache']['opcache.validate_timestamps'] = '1'
-                config['opcache']['opcache.consistency_checks'] = '0'
                 with open('/etc/php/7.3/fpm/php.ini',
                           encoding='utf-8', mode='w') as configfile:
                     Log.debug(self, "Writting php configuration into "
@@ -882,7 +882,9 @@ class WOStackController(CementBaseController):
                 config['www']['chdir'] = '/'
                 config['www']['prefix'] = '/var/run/php'
                 config['www']['listen'] = 'php73-fpm.sock'
+                config['www']['listen.mode'] = '0660'
                 config['www']['listen.backlog'] = '32768'
+                config['www']['catch_workers_output'] = 'yes'
                 with codecs.open('/etc/php/7.3/fpm/pool.d/www.conf',
                                  encoding='utf-8', mode='w') as configfile:
                     Log.debug(self, "writting PHP 7.3 configuration into "