From cc2dc81c84d4958c27a2a0f3c00e50bba6ccded8 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Tue, 24 Sep 2024 14:22:58 +0900
Subject: [PATCH] Fixed PHP error logging

---
 .../web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf     | 3 ++-
 Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf | 3 ++-
 .../web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf     | 3 ++-
 Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf | 3 ++-
 .../alpine/conf/etc/php83/php-fpm.d/zabbix.conf                | 3 ++-
 .../web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf      | 3 ++-
 Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf  | 3 ++-
 .../web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf        | 3 ++-
 .../ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf             | 3 ++-
 .../alpine/conf/etc/php83/php-fpm.d/zabbix.conf                | 3 ++-
 .../web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf      | 3 ++-
 Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf  | 3 ++-
 .../web-nginx-pgsql/rhel/conf/etc/php-fpm.d/zabbix.conf        | 3 ++-
 .../ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf             | 3 ++-
 14 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf
+++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.d/zabbix.conf
+++ b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/php-fpm.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session
diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf
index 05dc3ec2b..66c3c1252 100644
--- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf
+++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf
@@ -16,8 +16,9 @@ pm.max_requests = ${PHP_FPM_PM_MAX_REQUESTS}
 
 slowlog = /dev/fd/1
 
-; php_admin_value[error_log] = /dev/fd/2
+php_admin_value[error_log] = /dev/fd/2
 php_admin_flag[log_errors] = on
+catch_workers_output = yes
 
 php_value[session.save_handler] = files
 php_value[session.save_path]    = /var/lib/php/session