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 5a2c34400..8a45d01ae 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -224,6 +224,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + 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 8372fe3c4..7e5da87a2 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -224,6 +224,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + 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/rhel/conf/etc/zabbix/nginx.conf b/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf index 62c9be112..fbc144486 100644 --- a/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf +++ b/web-nginx-mysql/rhel/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/rhel/conf/etc/zabbix/nginx_ssl.conf b/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf index 4341593d7..44594adb7 100644 --- a/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf +++ b/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf @@ -1,5 +1,5 @@ server { - listen 8443 http2; + listen 8443 ssl http2; server_name zabbix; server_name_in_redirect off; @@ -28,7 +28,7 @@ server { ssl_session_timeout 10m; ssl_prefer_server_ciphers on; - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload"; + add_header Strict-Transport-Security "max-age=31536000; preload"; add_header Content-Security-Policy-Report-Only "default-src https:; script-src https: 'unsafe-eval' 'unsafe-inline'; style-src https: 'unsafe-inline'; img-src https: data:; font-src https: data:; report-uri /csp-report"; location =/nginx_status { @@ -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/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 b1723176a..97d5faf8a 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -224,6 +224,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + 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 06ef99376..4cb548b4b 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -208,6 +208,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + 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 028e821ac..bfe44f8af 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -208,6 +208,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + 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 56ad24684..acdbb0c5b 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -208,6 +208,17 @@ prepare_zbx_web_config() { rm -f "/tmp/defines.inc.php_tmp" fi + 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/zabbix-appliance/rhel/conf/etc/zabbix/nginx.conf b/zabbix-appliance/rhel/conf/etc/zabbix/nginx.conf index 62c9be112..fbc144486 100644 --- a/zabbix-appliance/rhel/conf/etc/zabbix/nginx.conf +++ b/zabbix-appliance/rhel/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/zabbix-appliance/rhel/conf/etc/zabbix/nginx_ssl.conf b/zabbix-appliance/rhel/conf/etc/zabbix/nginx_ssl.conf index e50ea368d..44594adb7 100644 --- a/zabbix-appliance/rhel/conf/etc/zabbix/nginx_ssl.conf +++ b/zabbix-appliance/rhel/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;