Snarp/zabbix
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Using direct stdout / stderr for Nginx

Browse source
This commit is contained in:
Alexey Pustovalov 2026-07-13 23:23:23 +09:00
parent 0f8c1c3048
commit 894791882a
23 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-common.conf
View file

@ -2,7 +2,7 @@ server_name zabbix;
index {HTTP_INDEX_FILE};
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log notice;
error_log stderr notice;
set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf
View file

@ -3,7 +3,7 @@ include /etc/nginx/includes/user.conf;
worker_processes 5;
worker_rlimit_nofile 256000;
error_log /var/log/nginx/error.log error;
error_log stderr error;
pid /tmp/nginx.pid;
@ -21,7 +21,7 @@ http {
'"$http_user_agent" "$http_x_forwarded_for"';
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log error;
error_log stderr error;
client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-common.conf
View file

@ -2,7 +2,7 @@ server_name zabbix;
index {HTTP_INDEX_FILE};
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log notice;
error_log stderr notice;
set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf
View file

@ -3,7 +3,7 @@ include /etc/nginx/includes/user.conf;
worker_processes 5;
worker_rlimit_nofile 256000;
error_log /var/log/nginx/error.log error;
error_log stderr error;
pid /tmp/nginx.pid;
@ -21,7 +21,7 @@ http {
'"$http_user_agent" "$http_x_forwarded_for"';
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log error;
error_log stderr error;
client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-common.conf
View file

@ -2,7 +2,7 @@ server_name zabbix;
index {HTTP_INDEX_FILE};
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log notice;
error_log stderr notice;
set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf
View file

@ -3,7 +3,7 @@ include /etc/nginx/includes/user.conf;
worker_processes 5;
worker_rlimit_nofile 256000;
error_log /var/log/nginx/error.log error;
error_log stderr error;
pid /tmp/nginx.pid;
@ -21,7 +21,7 @@ http {
'"$http_user_agent" "$http_x_forwarded_for"';
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log error;
error_log stderr error;
client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-common.conf
View file

@ -2,7 +2,7 @@ server_name zabbix;
index {HTTP_INDEX_FILE};
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log notice;
error_log stderr notice;
set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf
View file

@ -3,7 +3,7 @@ include /etc/nginx/includes/user.conf;
worker_processes 5;
worker_rlimit_nofile 256000;
error_log /var/log/nginx/error.log error;
error_log stderr error;
pid /tmp/nginx.pid;
@ -21,7 +21,7 @@ http {
'"$http_user_agent" "$http_x_forwarded_for"';
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log error;
error_log stderr error;
client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-common.conf
View file

@ -2,7 +2,7 @@ server_name zabbix;
index {HTTP_INDEX_FILE};
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log notice;
error_log stderr notice;
set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf
View file

@ -3,7 +3,7 @@ include /etc/nginx/includes/user.conf;
worker_processes 5;
worker_rlimit_nofile 256000;
error_log /var/log/nginx/error.log error;
error_log stderr error;
pid /tmp/nginx.pid;
@ -21,7 +21,7 @@ http {
'"$http_user_agent" "$http_x_forwarded_for"';
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log error;
error_log stderr error;
client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf
View file

@ -2,7 +2,7 @@ server_name zabbix;
index {HTTP_INDEX_FILE};
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log notice;
error_log stderr notice;
set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf
View file

@ -3,7 +3,7 @@ include /etc/nginx/includes/user.conf;
worker_processes 5;
worker_rlimit_nofile 256000;
error_log /var/log/nginx/error.log error;
error_log stderr error;
pid /tmp/nginx.pid;
@ -21,7 +21,7 @@ http {
'"$http_user_agent" "$http_x_forwarded_for"';
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log error;
error_log stderr error;
client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-common.conf
View file

@ -2,7 +2,7 @@ server_name zabbix;
index {HTTP_INDEX_FILE};
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log notice;
error_log stderr notice;
set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf
View file

@ -3,7 +3,7 @@ include /etc/nginx/includes/user.conf;
worker_processes 5;
worker_rlimit_nofile 256000;
error_log /var/log/nginx/error.log error;
error_log stderr error;
pid /tmp/nginx.pid;
@ -21,7 +21,7 @@ http {
'"$http_user_agent" "$http_x_forwarded_for"';
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log error;
error_log stderr error;
client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-common.conf
View file

@ -2,7 +2,7 @@ server_name zabbix;
index {HTTP_INDEX_FILE};
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log notice;
error_log stderr notice;
set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf
View file

@ -3,7 +3,7 @@ include /etc/nginx/includes/user.conf;
worker_processes 5;
worker_rlimit_nofile 256000;
error_log /var/log/nginx/error.log error;
error_log stderr error;
pid /tmp/nginx.pid;
@ -21,7 +21,7 @@ http {
'"$http_user_agent" "$http_x_forwarded_for"';
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log error;
error_log stderr error;
client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-common.conf
View file

@ -2,7 +2,7 @@ server_name zabbix;
index {HTTP_INDEX_FILE};
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log notice;
error_log stderr notice;
set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/nginx.conf
View file

@ -3,7 +3,7 @@ include /etc/nginx/includes/user.conf;
worker_processes 5;
worker_rlimit_nofile 256000;
error_log /var/log/nginx/error.log error;
error_log stderr error;
pid /tmp/nginx.pid;
@ -21,7 +21,7 @@ http {
'"$http_user_agent" "$http_x_forwarded_for"';
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log error;
error_log stderr error;
client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-common.conf
View file

@ -2,7 +2,7 @@ server_name zabbix;
index {HTTP_INDEX_FILE};
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log notice;
error_log stderr notice;
set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf
View file

@ -3,7 +3,7 @@ include /etc/nginx/includes/user.conf;
worker_processes 5;
worker_rlimit_nofile 256000;
error_log /var/log/nginx/error.log error;
error_log stderr error;
pid /tmp/nginx.pid;
@ -21,7 +21,7 @@ http {
'"$http_user_agent" "$http_x_forwarded_for"';
include /etc/nginx/includes/access-log.conf;
error_log /var/log/nginx/error.log error;
error_log stderr error;
client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2;

2
templates/entrypoints/lib/nginx.sh
View file

@ -68,7 +68,7 @@ prepare_web_server() {
if [ "${ENABLE_WEB_ACCESS_LOG,,}" = "false" ]; then
printf 'access_log off;\n' > "${NGINX_INCLUDES_DIR}/access-log.conf"
else
printf 'access_log /var/log/nginx/access.log main;\n' > "${NGINX_INCLUDES_DIR}/access-log.conf"
printf 'access_log /dev/stdout main;\n' > "${NGINX_INCLUDES_DIR}/access-log.conf"
fi
if [ -n "${WEB_REAL_IP_FROM:-}" ]; then

2
templates/entrypoints/web-nginx-mysql.sh
View file

@ -21,7 +21,7 @@ prepare_runtime_commands() {
PHP_FPM_BIN="${PHP_FPM_BIN:-/usr/sbin/php-fpm}"
PHP_FPM_CONFIG="${PHP_FPM_CONFIG:-/etc/php-fpm.conf}"
NGINX_ARGS=(-g 'daemon off;error_log /var/log/nginx/error.log error;' -c /etc/nginx/nginx.conf)
NGINX_ARGS=(-e stderr -g 'daemon off;' -c "${NGINX_CONF_FILE}")
PHP_FPM_ARGS=(--nodaemonize --fpm-config "${PHP_FPM_CONFIG}")
}

2
templates/entrypoints/web-nginx-pgsql.sh
View file

@ -21,7 +21,7 @@ prepare_runtime_commands() {
PHP_FPM_BIN="${PHP_FPM_BIN:-/usr/sbin/php-fpm}"
PHP_FPM_CONFIG="${PHP_FPM_CONFIG:-/etc/php-fpm.conf}"
NGINX_ARGS=(-g 'daemon off;error_log /var/log/nginx/error.log error;' -c /etc/nginx/nginx.conf)
NGINX_ARGS=(-e stderr -g 'daemon off;' -c "${NGINX_CONF_FILE}")
PHP_FPM_ARGS=(--nodaemonize --fpm-config "${PHP_FPM_CONFIG}")
}