diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index 030953363..225d015dc 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -6,7 +6,6 @@ services: - "10051:10051" volumes: - /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/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/export:/var/lib/zabbix/export:rw @@ -74,7 +73,6 @@ services: - "10061:10051" volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone: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/enc:/var/lib/zabbix/enc:ro @@ -124,7 +122,6 @@ services: - "10071:10051" volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone: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/enc:/var/lib/zabbix/enc:ro @@ -187,7 +184,6 @@ services: - zabbix-server:zabbix-server volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro deploy: @@ -244,7 +240,6 @@ services: - zabbix-server:zabbix-server volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro deploy: @@ -297,7 +292,6 @@ services: - "10050:10050" volumes: - /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/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 2924b6f48..d00d5a657 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -10,7 +10,6 @@ services: - "10051:10051" volumes: - /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/externalscripts:/usr/lib/zabbix/externalscripts:ro - ./zbx_env/var/lib/zabbix/export:/var/lib/zabbix/export:rw @@ -82,7 +81,6 @@ services: - "10061:10051" volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone: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/enc:/var/lib/zabbix/enc:ro @@ -136,7 +134,6 @@ services: - "10071:10051" volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone: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/enc:/var/lib/zabbix/enc:ro @@ -203,7 +200,6 @@ services: - zabbix-server:zabbix-server volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro deploy: @@ -264,7 +260,6 @@ services: - zabbix-server:zabbix-server volumes: - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro deploy: @@ -321,7 +316,6 @@ services: - "10050:10050" volumes: - /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/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro diff --git a/web-apache-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/web-apache-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 103d56271..8badf9d43 100644 --- a/web-apache-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/web-apache-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -16,7 +16,7 @@ stdout_logfile = /dev/stdout stdout_logfile_maxbytes = 0 [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 autorestart = true diff --git a/web-apache-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/web-apache-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 103d56271..8badf9d43 100644 --- a/web-apache-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/web-apache-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -16,7 +16,7 @@ stdout_logfile = /dev/stdout stdout_logfile_maxbytes = 0 [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 autorestart = true diff --git a/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf b/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf index 134b95140..56e330bae 100644 --- a/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf +++ b/zabbix-appliance/rhel/conf/etc/supervisor/conf.d/supervisord_web_nginx.conf @@ -16,7 +16,7 @@ stdout_logfile = /dev/stdout stdout_logfile_maxbytes = 0 [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 autorestart = true