From 27f6cb45a54e062d58e8c6e4c3d94b897085f414 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 19 Jan 2024 13:17:09 +0900 Subject: [PATCH] Using different way to redirect Nginx messages to stdout / stderr --- Dockerfiles/web-nginx-mysql/alpine/Dockerfile | 3 ++- .../web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf | 6 +++--- .../conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 2 +- .../web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf | 4 ++-- .../alpine/conf/etc/zabbix/nginx_ssl.conf | 4 ++-- Dockerfiles/web-nginx-mysql/centos/Dockerfile | 9 +++++---- .../web-nginx-mysql/centos/conf/etc/nginx/nginx.conf | 6 +++--- .../conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 2 +- .../web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf | 4 ++-- .../centos/conf/etc/zabbix/nginx_ssl.conf | 4 ++-- Dockerfiles/web-nginx-mysql/ol/Dockerfile | 8 +++++--- Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf | 6 +++--- .../conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 2 +- .../web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf | 4 ++-- .../web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf | 4 ++-- Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 8 +++++--- .../web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf | 6 +++--- .../etc/supervisor/conf.d/supervisord_web_nginx.conf | 2 +- .../web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf | 4 ++-- .../web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf | 4 ++-- Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile | 3 ++- .../web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf | 6 +++--- .../conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 2 +- .../web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf | 4 ++-- .../ubuntu/conf/etc/zabbix/nginx_ssl.conf | 4 ++-- Dockerfiles/web-nginx-pgsql/alpine/Dockerfile | 3 ++- .../web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf | 6 +++--- .../conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 2 +- .../web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf | 4 ++-- .../alpine/conf/etc/zabbix/nginx_ssl.conf | 4 ++-- Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 8 +++++--- .../web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf | 6 +++--- .../conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 2 +- .../web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf | 4 ++-- .../centos/conf/etc/zabbix/nginx_ssl.conf | 4 ++-- Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 8 +++++--- Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf | 6 +++--- .../conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 2 +- .../web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf | 4 ++-- .../web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf | 4 ++-- Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile | 3 ++- .../web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf | 6 +++--- .../conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 2 +- .../web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf | 4 ++-- .../ubuntu/conf/etc/zabbix/nginx_ssl.conf | 4 ++-- 45 files changed, 105 insertions(+), 92 deletions(-) diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 82e396a80..5f2cb0bb2 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -81,7 +81,8 @@ RUN set -eux && \ mkdir -p /var/lib/php/session && \ rm -rf /etc/php7/php-fpm.d/www.conf && \ rm -f /etc/nginx/http.d/*.conf && \ - ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ 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 770522adf..75f0f9a1b 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf @@ -2,7 +2,7 @@ worker_processes 5; worker_rlimit_nofile 256000; -error_log /dev/fd/2 error; +error_log /var/log/nginx/error.log error; pid /tmp/nginx.pid; @@ -20,8 +20,8 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log error; client_body_temp_path /tmp/client_body 1 2; proxy_temp_path /tmp/proxy 1 2; diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 6268ac47c..713c778ab 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /var/log/nginx/error.log error;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf index dbb3ebecd..d9d8a743a 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx.conf @@ -5,8 +5,8 @@ server { server_name zabbix; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 notice; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log notice; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf index e37876913..339878dc4 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/zabbix/nginx_ssl.conf @@ -6,8 +6,8 @@ server { server_name_in_redirect off; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log error; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index 3bcb741c5..9cd8d5ffd 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -75,7 +75,8 @@ RUN set -eux && \ mkdir -p /var/lib/php/session && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/php-fpm.d/www.conf && \ - + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ @@ -90,9 +91,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ - chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ - chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ + chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ + chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ 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 3bed3cf89..6bc8c1739 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf @@ -2,7 +2,7 @@ worker_processes 5; worker_rlimit_nofile 256000; -error_log /dev/fd/2 error; +error_log /var/log/nginx/error.log error; pid /tmp/nginx.pid; @@ -20,8 +20,8 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log 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/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 5b10705cf..c81b68daa 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /var/log/nginx/error.log error;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf index dbb3ebecd..d9d8a743a 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf @@ -5,8 +5,8 @@ server { server_name zabbix; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 notice; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log notice; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf index e37876913..339878dc4 100644 --- a/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf @@ -6,8 +6,8 @@ server { server_name_in_redirect off; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log error; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index 3ea5e689a..62f3fccdd 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -76,6 +76,8 @@ RUN set -eux && \ mkdir -p /var/lib/php/session && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/php-fpm.d/www.conf && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ @@ -90,9 +92,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ - chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ - chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ + chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ + chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ 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 3bed3cf89..6bc8c1739 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf @@ -2,7 +2,7 @@ worker_processes 5; worker_rlimit_nofile 256000; -error_log /dev/fd/2 error; +error_log /var/log/nginx/error.log error; pid /tmp/nginx.pid; @@ -20,8 +20,8 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log 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/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 5b10705cf..c81b68daa 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /var/log/nginx/error.log error;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf index dbb3ebecd..d9d8a743a 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx.conf @@ -5,8 +5,8 @@ server { server_name zabbix; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 notice; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log notice; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf index e37876913..339878dc4 100644 --- a/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf @@ -6,8 +6,8 @@ server { server_name_in_redirect off; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log error; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index 8d0f19137..3f71cc3e2 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -107,6 +107,8 @@ RUN set -eux && \ mkdir -p /var/lib/php/session && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/php-fpm.d/www.conf && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ @@ -121,9 +123,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ - chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ - chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ + chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ + chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ 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 3bed3cf89..6bc8c1739 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf @@ -2,7 +2,7 @@ worker_processes 5; worker_rlimit_nofile 256000; -error_log /dev/fd/2 error; +error_log /var/log/nginx/error.log error; pid /tmp/nginx.pid; @@ -20,8 +20,8 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log 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/supervisor/conf.d/supervisord_web_nginx.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf index 5b10705cf..c81b68daa 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /var/log/nginx/error.log error;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf index dbb3ebecd..d9d8a743a 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx.conf @@ -5,8 +5,8 @@ server { server_name zabbix; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 notice; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log notice; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf index e37876913..339878dc4 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf @@ -6,8 +6,8 @@ server { server_name_in_redirect off; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log error; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile index d18f82c6b..ef462bc17 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile @@ -94,8 +94,9 @@ RUN set -eux && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -rf /var/cache/nginx/ && \ rm -f /etc/php/7.4/fpm/pool.d/www.conf && \ - ln -sf /dev/fd/2 /var/log/nginx/error.log && \ rm -f /etc/php/7.4/fpm/php-fpm.conf.dpkg-dist && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ 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 3bed3cf89..6bc8c1739 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf @@ -2,7 +2,7 @@ worker_processes 5; worker_rlimit_nofile 256000; -error_log /dev/fd/2 error; +error_log /var/log/nginx/error.log error; pid /tmp/nginx.pid; @@ -20,8 +20,8 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log 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/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index a9d1d16c8..173df9218 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /var/log/nginx/error.log error;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf index dbb3ebecd..d9d8a743a 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx.conf @@ -5,8 +5,8 @@ server { server_name zabbix; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 notice; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log notice; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index e37876913..339878dc4 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -6,8 +6,8 @@ server { server_name_in_redirect off; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log error; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 58b9439a7..f4fce6c30 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -80,7 +80,8 @@ RUN set -eux && \ mkdir -p /var/lib/php/session && \ rm -rf /etc/php7/php-fpm.d/www.conf && \ rm -f /etc/nginx/http.d/*.conf && \ - ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ 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 770522adf..75f0f9a1b 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf @@ -2,7 +2,7 @@ worker_processes 5; worker_rlimit_nofile 256000; -error_log /dev/fd/2 error; +error_log /var/log/nginx/error.log error; pid /tmp/nginx.pid; @@ -20,8 +20,8 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log 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/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 6268ac47c..713c778ab 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /var/log/nginx/error.log error;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf index dbb3ebecd..d9d8a743a 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx.conf @@ -5,8 +5,8 @@ server { server_name zabbix; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 notice; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log notice; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf index e37876913..339878dc4 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/zabbix/nginx_ssl.conf @@ -6,8 +6,8 @@ server { server_name_in_redirect off; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log error; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index 11fa5d5a4..e30f90309 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -74,6 +74,8 @@ RUN set -eux && \ mkdir -p /var/lib/php/session && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/php-fpm.d/www.conf && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ @@ -88,9 +90,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ - chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ - chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ + chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ + chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ 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 3bed3cf89..6bc8c1739 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf @@ -2,7 +2,7 @@ worker_processes 5; worker_rlimit_nofile 256000; -error_log /dev/fd/2 error; +error_log /var/log/nginx/error.log error; pid /tmp/nginx.pid; @@ -20,8 +20,8 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log 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/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 5b10705cf..c81b68daa 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /var/log/nginx/error.log error;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf index dbb3ebecd..d9d8a743a 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf @@ -5,8 +5,8 @@ server { server_name zabbix; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 notice; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log notice; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf index e37876913..339878dc4 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf @@ -6,8 +6,8 @@ server { server_name_in_redirect off; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log error; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index a5f0a284d..5dc947a11 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -75,6 +75,8 @@ RUN set -eux && \ mkdir -p /var/lib/php/session && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/php-fpm.d/www.conf && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ @@ -89,9 +91,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ - chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ - chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ + chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ + chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf /var/log/nginx/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ 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 3bed3cf89..6bc8c1739 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf @@ -2,7 +2,7 @@ worker_processes 5; worker_rlimit_nofile 256000; -error_log /dev/fd/2 error; +error_log /var/log/nginx/error.log error; pid /tmp/nginx.pid; @@ -20,8 +20,8 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log 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/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 5b10705cf..c81b68daa 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /var/log/nginx/error.log error;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf index dbb3ebecd..d9d8a743a 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx.conf @@ -5,8 +5,8 @@ server { server_name zabbix; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 notice; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log notice; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf index e37876913..339878dc4 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf @@ -6,8 +6,8 @@ server { server_name_in_redirect off; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log error; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index d5d13e3ed..dec555bf9 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile @@ -94,8 +94,9 @@ RUN set -eux && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -rf /var/cache/nginx/ && \ rm -f /etc/php/7.4/fpm/pool.d/www.conf && \ - ln -sf /dev/fd/2 /var/log/nginx/error.log && \ rm -f /etc/php/7.4/fpm/php-fpm.conf.dpkg-dist && \ + ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log && \ cd /usr/share/zabbix/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ 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 3bed3cf89..6bc8c1739 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf @@ -2,7 +2,7 @@ worker_processes 5; worker_rlimit_nofile 256000; -error_log /dev/fd/2 error; +error_log /var/log/nginx/error.log error; pid /tmp/nginx.pid; @@ -20,8 +20,8 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log 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/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index a9d1d16c8..173df9218 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /var/log/nginx/error.log error;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf index dbb3ebecd..d9d8a743a 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx.conf @@ -5,8 +5,8 @@ server { server_name zabbix; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 notice; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log notice; set $webroot '/usr/share/zabbix'; diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index e37876913..339878dc4 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -6,8 +6,8 @@ server { server_name_in_redirect off; index index.php; - access_log /dev/fd/1 main; - error_log /dev/fd/2 error; + access_log /var/log/nginx/access.log main; + error_log /var/log/nginx/error.log error; set $webroot '/usr/share/zabbix';