From a23386310fa80dbfcf5164742cd0db3b6f2a9716 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 10 Aug 2020 08:12:46 -0400
Subject: [PATCH] All images updated to latest stable base images Alpine 3.12,
 Ubuntu 20 (focal), CentOS 8

---
 .../etc/php/7.4/apache2/conf.d/99-zabbix.ini  |  9 +++++++
 .../{7.2 => 7.4}/apache2/conf.d/99-zabbix.ini |  0
 .../ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf  |  9 +++++++
 .../conf/etc/php/7.4/fpm/pool.d/zabbix.conf   | 25 +++++++++++++++++++
 .../ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf  |  9 +++++++
 .../conf/etc/php/7.4/fpm/pool.d/zabbix.conf   | 25 +++++++++++++++++++
 6 files changed, 77 insertions(+)
 create mode 100644 web-apache-mysql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini
 rename web-apache-pgsql/ubuntu/conf/etc/php/{7.2 => 7.4}/apache2/conf.d/99-zabbix.ini (100%)
 create mode 100644 web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf
 create mode 100644 web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf
 create mode 100644 web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf
 create mode 100644 web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf

diff --git a/web-apache-mysql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini b/web-apache-mysql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini
new file mode 100644
index 000000000..be93bd73a
--- /dev/null
+++ b/web-apache-mysql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini
@@ -0,0 +1,9 @@
+max_execution_time=300
+memory_limit=128M
+post_max_size=16M
+upload_max_filesize=2M
+max_input_time=300
+always_populate_raw_post_date=-1
+max_input_vars=10000
+; date.timezone=Europe/Riga
+;session.save_path=/var/lib/php/session
diff --git a/web-apache-pgsql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini b/web-apache-pgsql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini
similarity index 100%
rename from web-apache-pgsql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini
rename to web-apache-pgsql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini
diff --git a/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf b/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf
new file mode 100644
index 000000000..e2471b98b
--- /dev/null
+++ b/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf
@@ -0,0 +1,9 @@
+include=/etc/php/7.4/fpm/pool.d/*.conf
+
+[global]
+
+pid = /tmp/php-fpm.pid
+
+error_log = /dev/fd/2
+
+daemonize = no
diff --git a/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf b/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf
new file mode 100644
index 000000000..a4926f4ae
--- /dev/null
+++ b/web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf
@@ -0,0 +1,25 @@
+[zabbix]
+
+listen = /tmp/php-fpm.sock
+
+pm = dynamic
+pm.max_children = 50
+pm.start_servers = 5
+pm.min_spare_servers = 5
+pm.max_spare_servers = 35
+
+slowlog = /dev/fd/1
+
+php_admin_value[error_log] = /dev/fd/2
+php_admin_flag[log_errors] = on
+
+php_value[session.save_handler] = files
+php_value[session.save_path]    = /var/lib/php/session
+
+php_value[max_execution_time]= 300
+php_value[memory_limit]= 128M
+php_value[post_max_size]= 16M
+php_value[upload_max_filesize]= 2M
+php_value[max_input_time]= 300
+php_value[max_input_vars]= 10000
+; php_value[date.timezone]= Europe/Riga
diff --git a/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf b/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf
new file mode 100644
index 000000000..e2471b98b
--- /dev/null
+++ b/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf
@@ -0,0 +1,9 @@
+include=/etc/php/7.4/fpm/pool.d/*.conf
+
+[global]
+
+pid = /tmp/php-fpm.pid
+
+error_log = /dev/fd/2
+
+daemonize = no
diff --git a/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf b/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf
new file mode 100644
index 000000000..a4926f4ae
--- /dev/null
+++ b/web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf
@@ -0,0 +1,25 @@
+[zabbix]
+
+listen = /tmp/php-fpm.sock
+
+pm = dynamic
+pm.max_children = 50
+pm.start_servers = 5
+pm.min_spare_servers = 5
+pm.max_spare_servers = 35
+
+slowlog = /dev/fd/1
+
+php_admin_value[error_log] = /dev/fd/2
+php_admin_flag[log_errors] = on
+
+php_value[session.save_handler] = files
+php_value[session.save_path]    = /var/lib/php/session
+
+php_value[max_execution_time]= 300
+php_value[memory_limit]= 128M
+php_value[post_max_size]= 16M
+php_value[upload_max_filesize]= 2M
+php_value[max_input_time]= 300
+php_value[max_input_vars]= 10000
+; php_value[date.timezone]= Europe/Riga