diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-common.conf index 7c9533db..b77386b5 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-common.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/includes/server-common.conf @@ -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'; diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf index 316d1d00..5c8b1d31 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf @@ -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; diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-common.conf index 7c9533db..b77386b5 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-common.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/includes/server-common.conf @@ -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'; diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf index 6761468c..76021534 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf @@ -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; diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-common.conf index 7c9533db..b77386b5 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-common.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/includes/server-common.conf @@ -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'; diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf index 6761468c..76021534 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf @@ -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; diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-common.conf index 7c9533db..b77386b5 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-common.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/includes/server-common.conf @@ -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'; diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf index 6761468c..76021534 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf @@ -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; diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-common.conf index 7c9533db..b77386b5 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-common.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/includes/server-common.conf @@ -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'; diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf index 27494181..46db6396 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf @@ -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; diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf index 7c9533db..b77386b5 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/includes/server-common.conf @@ -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'; diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf index 316d1d00..5c8b1d31 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf @@ -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; diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-common.conf index 7c9533db..b77386b5 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-common.conf +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/includes/server-common.conf @@ -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'; diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf index 6761468c..76021534 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf @@ -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; diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-common.conf index 7c9533db..b77386b5 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-common.conf +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/includes/server-common.conf @@ -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'; diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf index 6761468c..76021534 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf @@ -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; diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-common.conf index 7c9533db..b77386b5 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-common.conf +++ b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/includes/server-common.conf @@ -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'; diff --git a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/nginx.conf index 6761468c..76021534 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/rhel/conf/etc/nginx/nginx.conf @@ -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; diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-common.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-common.conf index 7c9533db..b77386b5 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-common.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/includes/server-common.conf @@ -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'; diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf index 27494181..46db6396 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf @@ -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; diff --git a/templates/entrypoints/lib/nginx.sh b/templates/entrypoints/lib/nginx.sh index 54e9e2d5..901b34c0 100644 --- a/templates/entrypoints/lib/nginx.sh +++ b/templates/entrypoints/lib/nginx.sh @@ -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 diff --git a/templates/entrypoints/web-nginx-mysql.sh b/templates/entrypoints/web-nginx-mysql.sh index 8d0f7e45..8be9a868 100644 --- a/templates/entrypoints/web-nginx-mysql.sh +++ b/templates/entrypoints/web-nginx-mysql.sh @@ -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}") } diff --git a/templates/entrypoints/web-nginx-pgsql.sh b/templates/entrypoints/web-nginx-pgsql.sh index e460cca8..94432fee 100644 --- a/templates/entrypoints/web-nginx-pgsql.sh +++ b/templates/entrypoints/web-nginx-pgsql.sh @@ -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}") }