From 3bbbdeff929ceaa8de474b616a419bfb8ee9990b Mon Sep 17 00:00:00 2001
From: root <root@ubuntu-linux.localdomain>
Date: Fri, 27 Oct 2017 18:53:31 +0300
Subject: [PATCH] Fixed MySQL user creation

---
 agent/alpine/run_zabbix_component.sh            | 2 +-
 agent/ubuntu/run_zabbix_component.sh            | 2 +-
 java-gateway/alpine/run_zabbix_component.sh     | 2 +-
 java-gateway/ubuntu/run_zabbix_component.sh     | 2 +-
 proxy-mysql/alpine/run_zabbix_component.sh      | 2 +-
 proxy-mysql/ubuntu/run_zabbix_component.sh      | 2 +-
 proxy-sqlite3/alpine/run_zabbix_component.sh    | 2 +-
 proxy-sqlite3/ubuntu/run_zabbix_component.sh    | 2 +-
 server-mysql/alpine/run_zabbix_component.sh     | 2 +-
 server-mysql/ubuntu/run_zabbix_component.sh     | 2 +-
 server-pgsql/alpine/run_zabbix_component.sh     | 2 +-
 server-pgsql/ubuntu/run_zabbix_component.sh     | 2 +-
 web-apache-mysql/alpine/run_zabbix_component.sh | 2 +-
 web-apache-mysql/ubuntu/run_zabbix_component.sh | 2 +-
 web-apache-pgsql/alpine/run_zabbix_component.sh | 2 +-
 web-apache-pgsql/ubuntu/run_zabbix_component.sh | 2 +-
 web-nginx-mysql/alpine/run_zabbix_component.sh  | 2 +-
 web-nginx-mysql/ubuntu/run_zabbix_component.sh  | 2 +-
 web-nginx-pgsql/alpine/run_zabbix_component.sh  | 2 +-
 web-nginx-pgsql/ubuntu/run_zabbix_component.sh  | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/agent/alpine/run_zabbix_component.sh b/agent/alpine/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/agent/alpine/run_zabbix_component.sh
+++ b/agent/alpine/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/agent/ubuntu/run_zabbix_component.sh b/agent/ubuntu/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/agent/ubuntu/run_zabbix_component.sh
+++ b/agent/ubuntu/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/java-gateway/alpine/run_zabbix_component.sh b/java-gateway/alpine/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/java-gateway/alpine/run_zabbix_component.sh
+++ b/java-gateway/alpine/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/java-gateway/ubuntu/run_zabbix_component.sh b/java-gateway/ubuntu/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/java-gateway/ubuntu/run_zabbix_component.sh
+++ b/java-gateway/ubuntu/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/proxy-mysql/alpine/run_zabbix_component.sh b/proxy-mysql/alpine/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/proxy-mysql/alpine/run_zabbix_component.sh
+++ b/proxy-mysql/alpine/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/proxy-mysql/ubuntu/run_zabbix_component.sh b/proxy-mysql/ubuntu/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/proxy-mysql/ubuntu/run_zabbix_component.sh
+++ b/proxy-mysql/ubuntu/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/proxy-sqlite3/alpine/run_zabbix_component.sh b/proxy-sqlite3/alpine/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/proxy-sqlite3/alpine/run_zabbix_component.sh
+++ b/proxy-sqlite3/alpine/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/proxy-sqlite3/ubuntu/run_zabbix_component.sh b/proxy-sqlite3/ubuntu/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/proxy-sqlite3/ubuntu/run_zabbix_component.sh
+++ b/proxy-sqlite3/ubuntu/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/server-mysql/alpine/run_zabbix_component.sh b/server-mysql/alpine/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/server-mysql/alpine/run_zabbix_component.sh
+++ b/server-mysql/alpine/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/server-mysql/ubuntu/run_zabbix_component.sh b/server-mysql/ubuntu/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/server-mysql/ubuntu/run_zabbix_component.sh
+++ b/server-mysql/ubuntu/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/server-pgsql/alpine/run_zabbix_component.sh b/server-pgsql/alpine/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/server-pgsql/alpine/run_zabbix_component.sh
+++ b/server-pgsql/alpine/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/server-pgsql/ubuntu/run_zabbix_component.sh b/server-pgsql/ubuntu/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/server-pgsql/ubuntu/run_zabbix_component.sh
+++ b/server-pgsql/ubuntu/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/web-apache-mysql/alpine/run_zabbix_component.sh b/web-apache-mysql/alpine/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/web-apache-mysql/alpine/run_zabbix_component.sh
+++ b/web-apache-mysql/alpine/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/web-apache-mysql/ubuntu/run_zabbix_component.sh b/web-apache-mysql/ubuntu/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/web-apache-mysql/ubuntu/run_zabbix_component.sh
+++ b/web-apache-mysql/ubuntu/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/web-apache-pgsql/alpine/run_zabbix_component.sh b/web-apache-pgsql/alpine/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/web-apache-pgsql/alpine/run_zabbix_component.sh
+++ b/web-apache-pgsql/alpine/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/web-apache-pgsql/ubuntu/run_zabbix_component.sh b/web-apache-pgsql/ubuntu/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/web-apache-pgsql/ubuntu/run_zabbix_component.sh
+++ b/web-apache-pgsql/ubuntu/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/web-nginx-mysql/alpine/run_zabbix_component.sh b/web-nginx-mysql/alpine/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/web-nginx-mysql/alpine/run_zabbix_component.sh
+++ b/web-nginx-mysql/alpine/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/web-nginx-mysql/ubuntu/run_zabbix_component.sh b/web-nginx-mysql/ubuntu/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/web-nginx-mysql/ubuntu/run_zabbix_component.sh
+++ b/web-nginx-mysql/ubuntu/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/web-nginx-pgsql/alpine/run_zabbix_component.sh b/web-nginx-pgsql/alpine/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/web-nginx-pgsql/alpine/run_zabbix_component.sh
+++ b/web-nginx-pgsql/alpine/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
diff --git a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
index cac24375e..73c4a03fb 100755
--- a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
+++ b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
@@ -136,7 +136,7 @@ check_variables_mysql() {
         DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
     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
     DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}