extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-24 16:54:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed php-fpm config argument from -c to -y

Browse Source
This commit is contained in:
Alexey Pustovalov 2020-07-09 01:08:03 +03:00
parent 0d3081806e
commit 15b6a9d795
5 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose_v3_ubuntu_mysql_latest.yaml
View File

@ -6,7 +6,6 @@ services:
- "10051:10051" - "10051:10051"
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
- ./zbx_env/var/lib/zabbix/export:/var/lib/zabbix/export:rw - ./zbx_env/var/lib/zabbix/export:/var/lib/zabbix/export:rw
@ -74,7 +73,6 @@ services:
- "10061:10051" - "10061:10051"
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -124,7 +122,6 @@ services:
- "10071:10051" - "10071:10051"
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -187,7 +184,6 @@ services:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
- ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro
deploy: deploy:
@ -244,7 +240,6 @@ services:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
- ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro
deploy: deploy:
@ -297,7 +292,6 @@ services:
- "10050:10050" - "10050:10050"
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro

6
docker-compose_v3_ubuntu_mysql_local.yaml
View File

@ -10,7 +10,6 @@ services:
- "10051:10051" - "10051:10051"
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
- ./zbx_env/var/lib/zabbix/export:/var/lib/zabbix/export:rw - ./zbx_env/var/lib/zabbix/export:/var/lib/zabbix/export:rw
@ -82,7 +81,6 @@ services:
- "10061:10051" - "10061:10051"
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -136,7 +134,6 @@ services:
- "10071:10051" - "10071:10051"
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -203,7 +200,6 @@ services:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
- ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro
deploy: deploy:
@ -264,7 +260,6 @@ services:
- zabbix-server:zabbix-server - zabbix-server:zabbix-server
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
- ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro
deploy: deploy:
@ -321,7 +316,6 @@ services:
- "10050:10050" - "10050:10050"
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
- ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro

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

@ -16,7 +16,7 @@ stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0 stdout_logfile_maxbytes = 0
[program:php-fpm] [program:php-fpm]
command = /usr/sbin/%(program_name)s -F -c /etc/%(program_name)s.conf command = /usr/sbin/%(program_name)s -F -y /etc/%(program_name)s.conf
auto_start = true auto_start = true
autorestart = true autorestart = true

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

@ -16,7 +16,7 @@ stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0 stdout_logfile_maxbytes = 0
[program:php-fpm] [program:php-fpm]
command = /usr/sbin/%(program_name)s -F -c /etc/%(program_name)s.conf command = /usr/sbin/%(program_name)s -F -y /etc/%(program_name)s.conf
auto_start = true auto_start = true
autorestart = true autorestart = true

2
zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf
View File

@ -16,7 +16,7 @@ stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0 stdout_logfile_maxbytes = 0
[program:php-fpm] [program:php-fpm]
command = /usr/sbin/%(program_name)s -F -c /etc/%(program_name)s.conf command = /usr/sbin/%(program_name)s -F -y /etc/%(program_name)s.conf
auto_start = true auto_start = true
autorestart = true autorestart = true