extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 16:45:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #263 from zabbix/master

Browse Source 
Master
This commit is contained in:
Alexey Pustovalov
2018-03-30 16:50:45 +03:00
committed by GitHub
parent ad42d1a355 2f8752ac1c
commit beae98e524
86 changed files with 7530 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
web-nginx-mysql/centos/docker-entrypoint.sh
View File

@ -10,12 +10,12 @@ if [ "${DEBUG_MODE}" == "true" ]; then
fi
# Type of Zabbix component
# Possible values: [server, proxy, agent, web, dev]
# Possible values: [server, proxy, agent, frontend, java-gateway, appliance]
zbx_type=${ZBX_TYPE}
# Type of Zabbix database
# Possible values: [mysql, postgresql]
zbx_db_type=${ZBX_DB_TYPE}
# Type of web-server. Valid only with zbx_type = web
# Type of web-server. Valid only with zbx_type = frontend
# Possible values: [apache, nginx]
zbx_opt_type=${ZBX_OPT_TYPE}
@ -45,12 +45,23 @@ configure_db_mysql() {
MYSQL_ALLOW_EMPTY_PASSWORD=true
MYSQL_DATA_DIR="/var/lib/mysql"
MYSQL_CONF_FILE="/etc/mysql/my.cnf"
if [ -f "/etc/mysql/my.cnf" ]; then
MYSQL_CONF_FILE="/etc/mysql/my.cnf"
elif [ -f "/etc/my.cnf.d/server.cnf" ]; then
MYSQL_CONF_FILE="/etc/my.cnf.d/server.cnf"
DB_SERVER_SOCKET="/var/lib/mysql/mysql.sock"
else
echo "**** Could not found MySQL configuration file"
exit 1
fi
if [ -f "/usr/bin/mysqld" ]; then
MYSQLD=/usr/bin/mysqld
elif [ -f "/usr/sbin/mysqld" ]; then
MYSQLD=/usr/sbin/mysqld
elif [ -f "/usr/libexec/mysqld" ]; then
MYSQLD=/usr/libexec/mysqld
else
echo "**** Could not found mysqld binary file"
exit 1
@ -79,7 +90,7 @@ configure_db_mysql() {
nohup $MYSQLD --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/mysql/plugin \
--user=mysql --log-output=none --pid-file=/var/lib/mysql/mysqld.pid \
--socket=/var/run/mysqld/mysqld.sock --port=3306 --character-set-server=utf8 --collation-server=utf8_bin &
--port=3306 --character-set-server=utf8 --collation-server=utf8_bin &
}
prepare_system() {
@ -641,6 +652,8 @@ update_zbx_config() {
update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
fi
update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
if [ "$type" == "proxy" ]; then
update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}"
update_config_var $ZBX_CONFIG "ProxyOfflineBuffer" "${ZBX_PROXYOFFLINEBUFFER}"