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

Merge branch 'master' into 3.0

Browse Source
This commit is contained in:
root
2019-04-11 17:06:53 +03:00
parent ba6c0055e3 fb123b4a89
commit f44962ab38
34 changed files with 136 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
agent/alpine/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
agent/centos/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
agent/ubuntu/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
java-gateway/alpine/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
java-gateway/centos/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
java-gateway/ubuntu/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
proxy-mysql/centos/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
proxy-sqlite3/alpine/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
proxy-sqlite3/centos/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
proxy-sqlite3/ubuntu/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
server-mysql/alpine/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
server-mysql/centos/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
server-pgsql/alpine/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
server-pgsql/centos/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
web-apache-mysql/alpine/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
web-apache-mysql/centos/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
web-apache-pgsql/alpine/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
web-apache-pgsql/centos/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

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

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

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

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

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

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
zabbix-appliance/alpine/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
zabbix-appliance/centos/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
zabbix-appliance/rhel/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"

7
zabbix-appliance/ubuntu/docker-entrypoint.sh
View File

@ -367,7 +367,7 @@ create_db_user_mysql() {
if [ -z "$USER_EXISTS" ]; then
mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
else
mysql_query "SET PASSWORD FOR '${DB_SERVER_ZBX_USER}'@'%' = PASSWORD('${DB_SERVER_ZBX_PASS}');" 1>/dev/null
mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
fi
mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
@ -653,10 +653,11 @@ update_zbx_config() {
fi
if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
update_config_var $ZBX_CONFIG "ListenPort" "10061"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
else
update_config_var $ZBX_CONFIG "ListenPort"
update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
fi
update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
update_config_var $ZBX_CONFIG "LogType" "console"
update_config_var $ZBX_CONFIG "LogFile"