extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-25 04:11:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed fastcgi_read_timeout value

Browse Source
This commit is contained in:
Alexey Pustovalov 2020-10-14 08:49:48 -04:00
parent c1980de853
commit 92e9489dce
18 changed files with 78 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf
View File

@ -65,7 +65,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

2
web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf
View File

@ -89,7 +89,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

11
web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -181,6 +181,17 @@ prepare_zbx_web_config() {
export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} 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 if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then
sed -ri \ sed -ri \
-e 's!^(\s*access_log).+\;!\1 off\;!g' \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \

2
web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf
View File

@ -65,7 +65,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

2
web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf
View File

@ -89,7 +89,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

11
web-nginx-mysql/centos/docker-entrypoint.sh
View File

@ -181,6 +181,17 @@ prepare_zbx_web_config() {
export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} 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 if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then
sed -ri \ sed -ri \
-e 's!^(\s*access_log).+\;!\1 off\;!g' \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \

2
web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf
View File

@ -65,7 +65,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

2
web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf
View File

@ -89,7 +89,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

11
web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -181,6 +181,17 @@ prepare_zbx_web_config() {
export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} 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 if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then
sed -ri \ sed -ri \
-e 's!^(\s*access_log).+\;!\1 off\;!g' \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \

2
web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf
View File

@ -65,7 +65,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

2
web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf
View File

@ -89,7 +89,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

11
web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -177,6 +177,17 @@ prepare_zbx_web_config() {
export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} 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 if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then
sed -ri \ sed -ri \
-e 's!^(\s*access_log).+\;!\1 off\;!g' \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \

2
web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf
View File

@ -65,7 +65,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

2
web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf
View File

@ -89,7 +89,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

11
web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -177,6 +177,17 @@ prepare_zbx_web_config() {
export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} 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 if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then
sed -ri \ sed -ri \
-e 's!^(\s*access_log).+\;!\1 off\;!g' \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \

2
web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf
View File

@ -65,7 +65,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

2
web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf
View File

@ -89,7 +89,7 @@ server {
fastcgi_ignore_client_abort off; fastcgi_ignore_client_abort off;
fastcgi_connect_timeout 60; fastcgi_connect_timeout 60;
fastcgi_send_timeout 180; fastcgi_send_timeout 180;
fastcgi_read_timeout 180; fastcgi_read_timeout {FCGI_READ_TIMEOUT};
fastcgi_buffer_size 128k; fastcgi_buffer_size 128k;
fastcgi_buffers 4 256k; fastcgi_buffers 4 256k;
fastcgi_busy_buffers_size 256k; fastcgi_busy_buffers_size 256k;

11
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -177,6 +177,17 @@ prepare_zbx_web_config() {
export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"} export ZBX_SERVER_PORT=${ZBX_SERVER_PORT:-"10051"}
export ZBX_SERVER_NAME=${ZBX_SERVER_NAME} 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 if [ "${ENABLE_WEB_ACCESS_LOG:-"true"}" == "false" ]; then
sed -ri \ sed -ri \
-e 's!^(\s*access_log).+\;!\1 off\;!g' \ -e 's!^(\s*access_log).+\;!\1 off\;!g' \