mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-04-03 12:00:55 +02:00
Merge branch 'master' into trunk
This commit is contained in:
commit
e3c8d6c3fa
@ -2,7 +2,7 @@
|
|||||||
worker_processes 5;
|
worker_processes 5;
|
||||||
worker_rlimit_nofile 256000;
|
worker_rlimit_nofile 256000;
|
||||||
|
|
||||||
error_log /dev/fd/2 warn;
|
error_log /dev/fd/2 error;
|
||||||
|
|
||||||
pid /tmp/nginx.pid;
|
pid /tmp/nginx.pid;
|
||||||
|
|
||||||
@ -21,13 +21,13 @@ http {
|
|||||||
'"$http_user_agent" "$http_x_forwarded_for"';
|
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||||
|
|
||||||
access_log /dev/fd/1 main;
|
access_log /dev/fd/1 main;
|
||||||
error_log /dev/fd/2 warn;
|
error_log /dev/fd/2 error;
|
||||||
|
|
||||||
client_body_temp_path /tmp 1 2;
|
client_body_temp_path /tmp/client_body 1 2;
|
||||||
proxy_temp_path /tmp 1 2;
|
proxy_temp_path /tmp/proxy 1 2;
|
||||||
fastcgi_temp_path /tmp 1 2;
|
fastcgi_temp_path /tmp/fastcgi 1 2;
|
||||||
uwsgi_temp_path /tmp 1 2;
|
uwsgi_temp_path /tmp/uwsgi 1 2;
|
||||||
scgi_temp_path /tmp 1 2;
|
scgi_temp_path /tmp/scgi 1 2;
|
||||||
|
|
||||||
client_body_timeout 5m;
|
client_body_timeout 5m;
|
||||||
send_timeout 5m;
|
send_timeout 5m;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
worker_processes 5;
|
worker_processes 5;
|
||||||
worker_rlimit_nofile 256000;
|
worker_rlimit_nofile 256000;
|
||||||
|
|
||||||
error_log /dev/fd/2 warn;
|
error_log /dev/fd/2 error;
|
||||||
|
|
||||||
pid /tmp/nginx.pid;
|
pid /tmp/nginx.pid;
|
||||||
|
|
||||||
@ -21,13 +21,13 @@ http {
|
|||||||
'"$http_user_agent" "$http_x_forwarded_for"';
|
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||||
|
|
||||||
access_log /dev/fd/1 main;
|
access_log /dev/fd/1 main;
|
||||||
error_log /dev/fd/2 warn;
|
error_log /dev/fd/2 error;
|
||||||
|
|
||||||
client_body_temp_path /tmp 1 2;
|
client_body_temp_path /tmp/client_body 1 2;
|
||||||
proxy_temp_path /tmp 1 2;
|
proxy_temp_path /tmp/proxy 1 2;
|
||||||
fastcgi_temp_path /tmp 1 2;
|
fastcgi_temp_path /tmp/fastcgi 1 2;
|
||||||
uwsgi_temp_path /tmp 1 2;
|
uwsgi_temp_path /tmp/uwsgi 1 2;
|
||||||
scgi_temp_path /tmp 1 2;
|
scgi_temp_path /tmp/scgi 1 2;
|
||||||
|
|
||||||
client_body_timeout 5m;
|
client_body_timeout 5m;
|
||||||
send_timeout 5m;
|
send_timeout 5m;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
worker_processes 5;
|
worker_processes 5;
|
||||||
worker_rlimit_nofile 256000;
|
worker_rlimit_nofile 256000;
|
||||||
|
|
||||||
error_log /dev/fd/2 warn;
|
error_log /dev/fd/2 error;
|
||||||
|
|
||||||
pid /tmp/nginx.pid;
|
pid /tmp/nginx.pid;
|
||||||
|
|
||||||
@ -21,13 +21,13 @@ http {
|
|||||||
'"$http_user_agent" "$http_x_forwarded_for"';
|
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||||
|
|
||||||
access_log /dev/fd/1 main;
|
access_log /dev/fd/1 main;
|
||||||
error_log /dev/fd/2 warn;
|
error_log /dev/fd/2 error;
|
||||||
|
|
||||||
client_body_temp_path /tmp 1 2;
|
client_body_temp_path /tmp/client_body 1 2;
|
||||||
proxy_temp_path /tmp 1 2;
|
proxy_temp_path /tmp/proxy 1 2;
|
||||||
fastcgi_temp_path /tmp 1 2;
|
fastcgi_temp_path /tmp/fastcgi 1 2;
|
||||||
uwsgi_temp_path /tmp 1 2;
|
uwsgi_temp_path /tmp/uwsgi 1 2;
|
||||||
scgi_temp_path /tmp 1 2;
|
scgi_temp_path /tmp/scgi 1 2;
|
||||||
|
|
||||||
client_body_timeout 5m;
|
client_body_timeout 5m;
|
||||||
send_timeout 5m;
|
send_timeout 5m;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
worker_processes 5;
|
worker_processes 5;
|
||||||
worker_rlimit_nofile 256000;
|
worker_rlimit_nofile 256000;
|
||||||
|
|
||||||
error_log /dev/fd/2 warn;
|
error_log /dev/fd/2 error;
|
||||||
|
|
||||||
pid /tmp/nginx.pid;
|
pid /tmp/nginx.pid;
|
||||||
|
|
||||||
@ -21,13 +21,13 @@ http {
|
|||||||
'"$http_user_agent" "$http_x_forwarded_for"';
|
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||||
|
|
||||||
access_log /dev/fd/1 main;
|
access_log /dev/fd/1 main;
|
||||||
error_log /dev/fd/2 warn;
|
error_log /dev/fd/2 error;
|
||||||
|
|
||||||
client_body_temp_path /tmp 1 2;
|
client_body_temp_path /tmp/client_body 1 2;
|
||||||
proxy_temp_path /tmp 1 2;
|
proxy_temp_path /tmp/proxy 1 2;
|
||||||
fastcgi_temp_path /tmp 1 2;
|
fastcgi_temp_path /tmp/fastcgi 1 2;
|
||||||
uwsgi_temp_path /tmp 1 2;
|
uwsgi_temp_path /tmp/uwsgi 1 2;
|
||||||
scgi_temp_path /tmp 1 2;
|
scgi_temp_path /tmp/scgi 1 2;
|
||||||
|
|
||||||
client_body_timeout 5m;
|
client_body_timeout 5m;
|
||||||
send_timeout 5m;
|
send_timeout 5m;
|
||||||
|
Loading…
Reference in New Issue
Block a user