From a98a984f6d122ce398a182a3c9cfa427019e5729 Mon Sep 17 00:00:00 2001
From: dotneft <alexey.pustovalov@zabbix.com>
Date: Thu, 27 Apr 2017 16:28:30 -0700
Subject: [PATCH] Fixed PostgreSQL default root account

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

diff --git a/agent/alpine/run_zabbix_component.sh b/agent/alpine/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/agent/alpine/run_zabbix_component.sh
+++ b/agent/alpine/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/agent/ubuntu/run_zabbix_component.sh b/agent/ubuntu/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/agent/ubuntu/run_zabbix_component.sh
+++ b/agent/ubuntu/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/java-gateway/alpine/run_zabbix_component.sh b/java-gateway/alpine/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/java-gateway/alpine/run_zabbix_component.sh
+++ b/java-gateway/alpine/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/java-gateway/ubuntu/run_zabbix_component.sh b/java-gateway/ubuntu/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/java-gateway/ubuntu/run_zabbix_component.sh
+++ b/java-gateway/ubuntu/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/proxy-mysql/alpine/run_zabbix_component.sh b/proxy-mysql/alpine/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/proxy-mysql/alpine/run_zabbix_component.sh
+++ b/proxy-mysql/alpine/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/proxy-mysql/ubuntu/run_zabbix_component.sh b/proxy-mysql/ubuntu/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/proxy-mysql/ubuntu/run_zabbix_component.sh
+++ b/proxy-mysql/ubuntu/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/proxy-sqlite3/alpine/run_zabbix_component.sh b/proxy-sqlite3/alpine/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/proxy-sqlite3/alpine/run_zabbix_component.sh
+++ b/proxy-sqlite3/alpine/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/proxy-sqlite3/ubuntu/run_zabbix_component.sh b/proxy-sqlite3/ubuntu/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/proxy-sqlite3/ubuntu/run_zabbix_component.sh
+++ b/proxy-sqlite3/ubuntu/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/server-mysql/alpine/run_zabbix_component.sh b/server-mysql/alpine/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/server-mysql/alpine/run_zabbix_component.sh
+++ b/server-mysql/alpine/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/server-mysql/ubuntu/run_zabbix_component.sh b/server-mysql/ubuntu/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/server-mysql/ubuntu/run_zabbix_component.sh
+++ b/server-mysql/ubuntu/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/server-pgsql/alpine/run_zabbix_component.sh b/server-pgsql/alpine/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/server-pgsql/alpine/run_zabbix_component.sh
+++ b/server-pgsql/alpine/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/server-pgsql/ubuntu/run_zabbix_component.sh b/server-pgsql/ubuntu/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/server-pgsql/ubuntu/run_zabbix_component.sh
+++ b/server-pgsql/ubuntu/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/web-apache-mysql/alpine/run_zabbix_component.sh b/web-apache-mysql/alpine/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/web-apache-mysql/alpine/run_zabbix_component.sh
+++ b/web-apache-mysql/alpine/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/web-apache-mysql/ubuntu/run_zabbix_component.sh b/web-apache-mysql/ubuntu/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/web-apache-mysql/ubuntu/run_zabbix_component.sh
+++ b/web-apache-mysql/ubuntu/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/web-apache-pgsql/alpine/run_zabbix_component.sh b/web-apache-pgsql/alpine/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/web-apache-pgsql/alpine/run_zabbix_component.sh
+++ b/web-apache-pgsql/alpine/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/web-apache-pgsql/ubuntu/run_zabbix_component.sh b/web-apache-pgsql/ubuntu/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/web-apache-pgsql/ubuntu/run_zabbix_component.sh
+++ b/web-apache-pgsql/ubuntu/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/web-nginx-mysql/alpine/run_zabbix_component.sh b/web-nginx-mysql/alpine/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/web-nginx-mysql/alpine/run_zabbix_component.sh
+++ b/web-nginx-mysql/alpine/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/web-nginx-mysql/ubuntu/run_zabbix_component.sh b/web-nginx-mysql/ubuntu/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/web-nginx-mysql/ubuntu/run_zabbix_component.sh
+++ b/web-nginx-mysql/ubuntu/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/web-nginx-pgsql/alpine/run_zabbix_component.sh b/web-nginx-pgsql/alpine/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/web-nginx-pgsql/alpine/run_zabbix_component.sh
+++ b/web-nginx-pgsql/alpine/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
diff --git a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
index fbb0ef982..1c8840f39 100755
--- a/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
+++ b/web-nginx-pgsql/ubuntu/run_zabbix_component.sh
@@ -202,6 +202,9 @@ check_db_connect_postgresql() {
     if [ "${USE_DB_ROOT_USER}" == "true" ]; then
         echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
         echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
+    else
+        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
+        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
     fi
     echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
     echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"