From 92e9489dce2d244ac70dc8f176786624c8d20033 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 14 Oct 2020 08:49:48 -0400 Subject: [PATCH] Fixed fastcgi_read_timeout value --- web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf | 2 +- web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf | 2 +- web-nginx-mysql/alpine/docker-entrypoint.sh | 11 +++++++++++ web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf | 2 +- web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf | 2 +- web-nginx-mysql/centos/docker-entrypoint.sh | 11 +++++++++++ web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf | 2 +- web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf | 2 +- web-nginx-mysql/ubuntu/docker-entrypoint.sh | 11 +++++++++++ web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf | 2 +- web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf | 2 +- web-nginx-pgsql/alpine/docker-entrypoint.sh | 11 +++++++++++ web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf | 2 +- web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf | 2 +- web-nginx-pgsql/centos/docker-entrypoint.sh | 11 +++++++++++ web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf | 2 +- web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf | 2 +- web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 11 +++++++++++ 18 files changed, 78 insertions(+), 12 deletions(-) diff --git a/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf b/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf index 62c9be112..fbc144486 100644 --- a/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf +++ b/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf @@ -65,7 +65,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf b/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf index e50ea368d..44594adb7 100644 --- a/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf +++ b/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf @@ -89,7 +89,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index 73bf1d9f3..bf9c3cab0 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -181,6 +181,17 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} + FCGI_READ_TIMEOUT=$(expr ${ZBX_MAXEXECUTIONTIME} + 1) + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ diff --git a/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf b/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf index 62c9be112..fbc144486 100644 --- a/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf +++ b/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf @@ -65,7 +65,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf b/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf index e50ea368d..44594adb7 100644 --- a/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf +++ b/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf @@ -89,7 +89,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh index 784768865..a287dcb58 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -181,6 +181,17 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} + FCGI_READ_TIMEOUT=$(expr ${ZBX_MAXEXECUTIONTIME} + 1) + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ diff --git a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf b/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf index 62c9be112..fbc144486 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf +++ b/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf @@ -65,7 +65,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index e50ea368d..44594adb7 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -89,7 +89,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index f99504e54..7ed3141fd 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -181,6 +181,17 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} + FCGI_READ_TIMEOUT=$(expr ${ZBX_MAXEXECUTIONTIME} + 1) + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ diff --git a/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf b/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf index 62c9be112..fbc144486 100644 --- a/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf +++ b/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf @@ -65,7 +65,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf b/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf index e50ea368d..44594adb7 100644 --- a/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf +++ b/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf @@ -89,7 +89,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh index 69c841b51..8f4bfc79d 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -177,6 +177,17 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} + FCGI_READ_TIMEOUT=$(expr ${ZBX_MAXEXECUTIONTIME} + 1) + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ diff --git a/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf b/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf index 62c9be112..fbc144486 100644 --- a/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf +++ b/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf @@ -65,7 +65,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf b/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf index e50ea368d..44594adb7 100644 --- a/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf +++ b/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf @@ -89,7 +89,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh index 8dc8c4dcd..c61faf30f 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -177,6 +177,17 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} + FCGI_READ_TIMEOUT=$(expr ${ZBX_MAXEXECUTIONTIME} + 1) + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \ diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf index 62c9be112..fbc144486 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf +++ b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf @@ -65,7 +65,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index e50ea368d..44594adb7 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -89,7 +89,7 @@ server { fastcgi_ignore_client_abort off; fastcgi_connect_timeout 60; fastcgi_send_timeout 180; - fastcgi_read_timeout 180; + fastcgi_read_timeout {FCGI_READ_TIMEOUT}; fastcgi_buffer_size 128k; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index b74181164..6d3e0b8ea 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -177,6 +177,17 @@ prepare_zbx_web_config() { export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} + FCGI_READ_TIMEOUT=$(expr ${ZBX_MAXEXECUTIONTIME} + 1) + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx.conf" + + if [ -f "$ZABBIX_ETC_DIR/nginx_ssl.conf" ]; then + sed -i \ + -e "s/{FCGI_READ_TIMEOUT}/${FCGI_READ_TIMEOUT}/g" \ + "$ZABBIX_ETC_DIR/nginx_ssl.conf" + fi + if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then sed -ri \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \