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

Fixed small issues. Preparation for Appliance

Browse Source
This commit is contained in:
root
2018-03-30 01:36:04 -07:00
parent fb6866403c
commit 2f8752ac1c
86 changed files with 7470 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -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}"

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

@ -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}"

17
web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -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}"