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 #166 from zabbix/master

Browse Source 
Fixed MySQL user creation
This commit is contained in:
Alexey Pustovalov
2017-10-27 18:54:20 +03:00
committed by GitHub
parent be8c034305 3bbbdeff92
commit 4fb4158517
20 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent/alpine/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
agent/ubuntu/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
java-gateway/alpine/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
java-gateway/ubuntu/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
proxy-mysql/alpine/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
proxy-mysql/ubuntu/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
proxy-sqlite3/alpine/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
proxy-sqlite3/ubuntu/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
server-mysql/alpine/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
server-mysql/ubuntu/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
server-pgsql/alpine/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
server-pgsql/ubuntu/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
web-apache-mysql/alpine/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
web-apache-mysql/ubuntu/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
web-apache-pgsql/alpine/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
web-apache-pgsql/ubuntu/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
web-nginx-mysql/alpine/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
web-nginx-mysql/ubuntu/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
web-nginx-pgsql/alpine/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}

2
web-nginx-pgsql/ubuntu/run_zabbix_component.sh
View File

@ -136,7 +136,7 @@ check_variables_mysql() {
DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
fi fi
[ -n "${MYSQL_USER}" ] || CREATE_ZBX_DB_USER=true [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
# If root password is not specified use provided credentials # If root password is not specified use provided credentials
DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}