extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-28 18:53:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Using different way to redirect Nginx messages to stdout / stderr

Browse Source
This commit is contained in:
Alexey Pustovalov 2024-01-19 13:17:09 +09:00
parent 91fcbd9b26
commit 27f6cb45a5
45 changed files with 105 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfiles/web-nginx-mysql/alpine/Dockerfile
View File

@ -81,7 +81,8 @@ RUN set -eux && \
mkdir -p /var/lib/php/session && \ mkdir -p /var/lib/php/session && \
rm -rf /etc/php7/php-fpm.d/www.conf && \ rm -rf /etc/php7/php-fpm.d/www.conf && \
rm -f /etc/nginx/http.d/*.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/ && \ cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ rm -rf tests && \

6
Dockerfiles/web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf
View File

@ -2,7 +2,7 @@
worker_processes 5; worker_processes 5;
worker_rlimit_nofile 256000; worker_rlimit_nofile 256000;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
@ -20,8 +20,8 @@ http {
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
client_body_temp_path /tmp/client_body 1 2; client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2; proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -2,7 +2,7 @@
nodaemon = true nodaemon = true
[program:nginx] [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 auto_start = true
autorestart = true autorestart = true

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

@ -5,8 +5,8 @@ server {
server_name zabbix; server_name zabbix;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 notice; error_log /var/log/nginx/error.log notice;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

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

@ -6,8 +6,8 @@ server {
server_name_in_redirect off; server_name_in_redirect off;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

9
Dockerfiles/web-nginx-mysql/centos/Dockerfile
View File

@ -75,7 +75,8 @@ RUN set -eux && \
mkdir -p /var/lib/php/session && \ mkdir -p /var/lib/php/session && \
rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/nginx/conf.d/*.conf && \
rm -f /etc/php-fpm.d/www.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/ && \ cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ 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/ && \ 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/ && \ 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/ && \ 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 && \ 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 && \ 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 && \ 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/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \
chgrp -R 0 /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \
chmod -R g=u /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \

6
Dockerfiles/web-nginx-mysql/centos/conf/etc/nginx/nginx.conf
View File

@ -2,7 +2,7 @@
worker_processes 5; worker_processes 5;
worker_rlimit_nofile 256000; worker_rlimit_nofile 256000;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
@ -20,8 +20,8 @@ http {
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
client_body_temp_path /tmp/client_body 1 2; client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2; proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -2,7 +2,7 @@
nodaemon = true nodaemon = true
[program:nginx] [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 auto_start = true
autorestart = true autorestart = true

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

@ -5,8 +5,8 @@ server {
server_name zabbix; server_name zabbix;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 notice; error_log /var/log/nginx/error.log notice;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

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

@ -6,8 +6,8 @@ server {
server_name_in_redirect off; server_name_in_redirect off;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

8
Dockerfiles/web-nginx-mysql/ol/Dockerfile
View File

@ -76,6 +76,8 @@ RUN set -eux && \
mkdir -p /var/lib/php/session && \ mkdir -p /var/lib/php/session && \
rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/nginx/conf.d/*.conf && \
rm -f /etc/php-fpm.d/www.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/ && \ cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ 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/ && \ 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/ && \ 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/ && \ 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 && \ 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 && \ 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 && \ 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/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \
chgrp -R 0 /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \
chmod -R g=u /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \

6
Dockerfiles/web-nginx-mysql/ol/conf/etc/nginx/nginx.conf
View File

@ -2,7 +2,7 @@
worker_processes 5; worker_processes 5;
worker_rlimit_nofile 256000; worker_rlimit_nofile 256000;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
@ -20,8 +20,8 @@ http {
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
client_body_temp_path /tmp/client_body 1 2; client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2; proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-mysql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -2,7 +2,7 @@
nodaemon = true nodaemon = true
[program:nginx] [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 auto_start = true
autorestart = true autorestart = true

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

@ -5,8 +5,8 @@ server {
server_name zabbix; server_name zabbix;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 notice; error_log /var/log/nginx/error.log notice;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-mysql/ol/conf/etc/zabbix/nginx_ssl.conf
View File

@ -6,8 +6,8 @@ server {
server_name_in_redirect off; server_name_in_redirect off;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

8
Dockerfiles/web-nginx-mysql/rhel/Dockerfile
View File

@ -107,6 +107,8 @@ RUN set -eux && \
mkdir -p /var/lib/php/session && \ mkdir -p /var/lib/php/session && \
rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/nginx/conf.d/*.conf && \
rm -f /etc/php-fpm.d/www.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/ && \ cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ 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/ && \ 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/ && \ 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/ && \ 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 && \ 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 && \ 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 && \ 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/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \
chgrp -R 0 /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \
chmod -R g=u /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \

6
Dockerfiles/web-nginx-mysql/rhel/conf/etc/nginx/nginx.conf
View File

@ -2,7 +2,7 @@
worker_processes 5; worker_processes 5;
worker_rlimit_nofile 256000; worker_rlimit_nofile 256000;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
@ -20,8 +20,8 @@ http {
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
client_body_temp_path /tmp/client_body 1 2; client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2; proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-mysql/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf
View File

@ -2,7 +2,7 @@
nodaemon = true nodaemon = true
[program:nginx] [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 auto_start = true
autorestart = true autorestart = true

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

@ -5,8 +5,8 @@ server {
server_name zabbix; server_name zabbix;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 notice; error_log /var/log/nginx/error.log notice;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-mysql/rhel/conf/etc/zabbix/nginx_ssl.conf
View File

@ -6,8 +6,8 @@ server {
server_name_in_redirect off; server_name_in_redirect off;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

3
Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile
View File

@ -94,8 +94,9 @@ RUN set -eux && \
rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/nginx/conf.d/*.conf && \
rm -rf /var/cache/nginx/ && \ rm -rf /var/cache/nginx/ && \
rm -f /etc/php/7.4/fpm/pool.d/www.conf && \ 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 && \ 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/ && \ cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ rm -rf tests && \

6
Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf
View File

@ -2,7 +2,7 @@
worker_processes 5; worker_processes 5;
worker_rlimit_nofile 256000; worker_rlimit_nofile 256000;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
@ -20,8 +20,8 @@ http {
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
client_body_temp_path /tmp/client_body 1 2; client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2; proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -2,7 +2,7 @@
nodaemon = true nodaemon = true
[program:nginx] [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 auto_start = true
autorestart = true autorestart = true

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

@ -5,8 +5,8 @@ server {
server_name zabbix; server_name zabbix;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 notice; error_log /var/log/nginx/error.log notice;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

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

@ -6,8 +6,8 @@ server {
server_name_in_redirect off; server_name_in_redirect off;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

3
Dockerfiles/web-nginx-pgsql/alpine/Dockerfile
View File

@ -80,7 +80,8 @@ RUN set -eux && \
mkdir -p /var/lib/php/session && \ mkdir -p /var/lib/php/session && \
rm -rf /etc/php7/php-fpm.d/www.conf && \ rm -rf /etc/php7/php-fpm.d/www.conf && \
rm -f /etc/nginx/http.d/*.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/ && \ cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ rm -rf tests && \

6
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf
View File

@ -2,7 +2,7 @@
worker_processes 5; worker_processes 5;
worker_rlimit_nofile 256000; worker_rlimit_nofile 256000;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
@ -20,8 +20,8 @@ http {
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
client_body_temp_path /tmp/client_body 1 2; client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2; proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -2,7 +2,7 @@
nodaemon = true nodaemon = true
[program:nginx] [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 auto_start = true
autorestart = true autorestart = true

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

@ -5,8 +5,8 @@ server {
server_name zabbix; server_name zabbix;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 notice; error_log /var/log/nginx/error.log notice;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

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

@ -6,8 +6,8 @@ server {
server_name_in_redirect off; server_name_in_redirect off;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

8
Dockerfiles/web-nginx-pgsql/centos/Dockerfile
View File

@ -74,6 +74,8 @@ RUN set -eux && \
mkdir -p /var/lib/php/session && \ mkdir -p /var/lib/php/session && \
rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/nginx/conf.d/*.conf && \
rm -f /etc/php-fpm.d/www.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/ && \ cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ 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/ && \ 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/ && \ 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/ && \ 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 && \ 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 && \ 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 && \ 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/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \
chgrp -R 0 /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \
chmod -R g=u /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \

6
Dockerfiles/web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf
View File

@ -2,7 +2,7 @@
worker_processes 5; worker_processes 5;
worker_rlimit_nofile 256000; worker_rlimit_nofile 256000;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
@ -20,8 +20,8 @@ http {
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
client_body_temp_path /tmp/client_body 1 2; client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2; proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -2,7 +2,7 @@
nodaemon = true nodaemon = true
[program:nginx] [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 auto_start = true
autorestart = true autorestart = true

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

@ -5,8 +5,8 @@ server {
server_name zabbix; server_name zabbix;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 notice; error_log /var/log/nginx/error.log notice;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

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

@ -6,8 +6,8 @@ server {
server_name_in_redirect off; server_name_in_redirect off;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

8
Dockerfiles/web-nginx-pgsql/ol/Dockerfile
View File

@ -75,6 +75,8 @@ RUN set -eux && \
mkdir -p /var/lib/php/session && \ mkdir -p /var/lib/php/session && \
rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/nginx/conf.d/*.conf && \
rm -f /etc/php-fpm.d/www.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/ && \ cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ 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/ && \ 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/ && \ 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/ && \ 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 && \ 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 && \ 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 && \ 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/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \
chgrp -R 0 /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \
chmod -R g=u /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \

6
Dockerfiles/web-nginx-pgsql/ol/conf/etc/nginx/nginx.conf
View File

@ -2,7 +2,7 @@
worker_processes 5; worker_processes 5;
worker_rlimit_nofile 256000; worker_rlimit_nofile 256000;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
@ -20,8 +20,8 @@ http {
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
client_body_temp_path /tmp/client_body 1 2; client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2; proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-pgsql/ol/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -2,7 +2,7 @@
nodaemon = true nodaemon = true
[program:nginx] [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 auto_start = true
autorestart = true autorestart = true

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

@ -5,8 +5,8 @@ server {
server_name zabbix; server_name zabbix;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 notice; error_log /var/log/nginx/error.log notice;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

4
Dockerfiles/web-nginx-pgsql/ol/conf/etc/zabbix/nginx_ssl.conf
View File

@ -6,8 +6,8 @@ server {
server_name_in_redirect off; server_name_in_redirect off;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

3
Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile
View File

@ -94,8 +94,9 @@ RUN set -eux && \
rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/nginx/conf.d/*.conf && \
rm -rf /var/cache/nginx/ && \ rm -rf /var/cache/nginx/ && \
rm -f /etc/php/7.4/fpm/pool.d/www.conf && \ 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 && \ 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/ && \ cd /usr/share/zabbix/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ rm -rf tests && \

6
Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf
View File

@ -2,7 +2,7 @@
worker_processes 5; worker_processes 5;
worker_rlimit_nofile 256000; worker_rlimit_nofile 256000;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
@ -20,8 +20,8 @@ http {
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
client_body_temp_path /tmp/client_body 1 2; client_body_temp_path /tmp/client_body 1 2;
proxy_temp_path /tmp/proxy 1 2; proxy_temp_path /tmp/proxy 1 2;

2
Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -2,7 +2,7 @@
nodaemon = true nodaemon = true
[program:nginx] [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 auto_start = true
autorestart = true autorestart = true

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

@ -5,8 +5,8 @@ server {
server_name zabbix; server_name zabbix;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 notice; error_log /var/log/nginx/error.log notice;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';

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

@ -6,8 +6,8 @@ server {
server_name_in_redirect off; server_name_in_redirect off;
index index.php; index index.php;
access_log /dev/fd/1 main; access_log /var/log/nginx/access.log main;
error_log /dev/fd/2 error; error_log /var/log/nginx/error.log error;
set $webroot '/usr/share/zabbix'; set $webroot '/usr/share/zabbix';