From 0f302df788b39620da4b243e62cbbe88ad9b13fb Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 15 Jan 2025 14:38:34 +0900 Subject: [PATCH] Migrate to PHP-FPM for all Web images --- .../web-apache-mysql/centos/conf/etc/httpd/conf/httpd.conf | 2 +- .../web-apache-mysql/ol/conf/etc/httpd/conf/httpd.conf | 2 +- .../web-apache-pgsql/centos/conf/etc/httpd/conf/httpd.conf | 2 +- .../web-apache-pgsql/ol/conf/etc/httpd/conf/httpd.conf | 2 +- .../web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf | 6 ++++-- Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh | 2 +- .../web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf | 6 ++++-- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf/httpd.conf b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf/httpd.conf index a1007af92..143489373 100644 --- a/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf/httpd.conf +++ b/Dockerfiles/web-apache-mysql/centos/conf/etc/httpd/conf/httpd.conf @@ -56,7 +56,7 @@ TraceEnable Off AddDefaultCharset UTF-8 - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 + RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500 SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 diff --git a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf/httpd.conf b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf/httpd.conf index a1007af92..143489373 100644 --- a/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf/httpd.conf +++ b/Dockerfiles/web-apache-mysql/ol/conf/etc/httpd/conf/httpd.conf @@ -56,7 +56,7 @@ TraceEnable Off AddDefaultCharset UTF-8 - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 + RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500 SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 diff --git a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf/httpd.conf b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf/httpd.conf index a1007af92..143489373 100644 --- a/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf/httpd.conf +++ b/Dockerfiles/web-apache-pgsql/centos/conf/etc/httpd/conf/httpd.conf @@ -56,7 +56,7 @@ TraceEnable Off AddDefaultCharset UTF-8 - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 + RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500 SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 diff --git a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf/httpd.conf b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf/httpd.conf index a1007af92..143489373 100644 --- a/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf/httpd.conf +++ b/Dockerfiles/web-apache-pgsql/ol/conf/etc/httpd/conf/httpd.conf @@ -56,7 +56,7 @@ TraceEnable Off AddDefaultCharset UTF-8 - RequestReadTimeout handshake=0 header=20-40,MinRate=500 body=20,MinRate=500 + RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500 SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index 91e21574a..ebe8918c4 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -1,6 +1,8 @@ server { - listen 8443 ssl http2; - listen [::]:8443 ssl http2; + listen 8443 ssl; + listen [::]:8443 ssl; + + http2 on; server_name zabbix; server_name_in_redirect off; diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index f27f00196..87689a89b 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -28,7 +28,7 @@ fi # Nginx main configuration file NGINX_CONF_FILE="/etc/nginx/nginx.conf" # Nginx virtual hosts configuration directory -NGINX_CONFD_DIR="/etc/nginx/http.d" +NGINX_CONFD_DIR="/etc/nginx/conf.d" # Directory with SSL certificate files for Nginx NGINX_SSL_CONFIG_DIR="/etc/ssl/nginx" # PHP-FPM configuration file diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index 91e21574a..ebe8918c4 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -1,6 +1,8 @@ server { - listen 8443 ssl http2; - listen [::]:8443 ssl http2; + listen 8443 ssl; + listen [::]:8443 ssl; + + http2 on; server_name zabbix; server_name_in_redirect off;