From f9ca4b70b18dd6f2c00969054bc32f8685d31fcf Mon Sep 17 00:00:00 2001
From: Bananenbieger1234 <48549289+Bananenbieger1234@users.noreply.github.com>
Date: Tue, 8 Mar 2022 12:50:21 +0100
Subject: [PATCH] Revert some changes of PR#53 concerning cluster recovery and
 restart scenarios. (#79)

Signed-off-by: Dominik Vogt <dominik.vogt@de.markant.com>
---
 .../rootfs/opt/bitnami/scripts/libmariadbgalera.sh          | 6 +++---
 .../rootfs/opt/bitnami/scripts/libmariadbgalera.sh          | 6 +++---
 .../rootfs/opt/bitnami/scripts/libmariadbgalera.sh          | 6 +++---
 .../rootfs/opt/bitnami/scripts/libmariadbgalera.sh          | 6 +++---
 .../rootfs/opt/bitnami/scripts/libmariadbgalera.sh          | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bitnami/mariadb-galera/10.2/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.2/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
index 1ca7e5bb7e9b..61420de633c1 100644
--- a/bitnami/mariadb-galera/10.2/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
+++ b/bitnami/mariadb-galera/10.2/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
@@ -181,10 +181,10 @@ has_galera_cluster_other_nodes() {
 #########################
 get_galera_cluster_address_value() {
     local cluster_address
-    if is_boolean_yes "$(get_galera_cluster_bootstrap_value)"; then
-        cluster_address="gcomm://"
-    else
+    if ! is_boolean_yes "$(get_galera_cluster_bootstrap_value)" && is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
         cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
+    else
+        cluster_address="gcomm://"
     fi
     debug "Set Galera cluster address to ${cluster_address}"
     echo "$cluster_address"
diff --git a/bitnami/mariadb-galera/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
index 1ca7e5bb7e9b..61420de633c1 100644
--- a/bitnami/mariadb-galera/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
+++ b/bitnami/mariadb-galera/10.3/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
@@ -181,10 +181,10 @@ has_galera_cluster_other_nodes() {
 #########################
 get_galera_cluster_address_value() {
     local cluster_address
-    if is_boolean_yes "$(get_galera_cluster_bootstrap_value)"; then
-        cluster_address="gcomm://"
-    else
+    if ! is_boolean_yes "$(get_galera_cluster_bootstrap_value)" && is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
         cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
+    else
+        cluster_address="gcomm://"
     fi
     debug "Set Galera cluster address to ${cluster_address}"
     echo "$cluster_address"
diff --git a/bitnami/mariadb-galera/10.4/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.4/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
index 1ca7e5bb7e9b..61420de633c1 100644
--- a/bitnami/mariadb-galera/10.4/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
+++ b/bitnami/mariadb-galera/10.4/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
@@ -181,10 +181,10 @@ has_galera_cluster_other_nodes() {
 #########################
 get_galera_cluster_address_value() {
     local cluster_address
-    if is_boolean_yes "$(get_galera_cluster_bootstrap_value)"; then
-        cluster_address="gcomm://"
-    else
+    if ! is_boolean_yes "$(get_galera_cluster_bootstrap_value)" && is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
         cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
+    else
+        cluster_address="gcomm://"
     fi
     debug "Set Galera cluster address to ${cluster_address}"
     echo "$cluster_address"
diff --git a/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
index 1ca7e5bb7e9b..61420de633c1 100644
--- a/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
+++ b/bitnami/mariadb-galera/10.5/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
@@ -181,10 +181,10 @@ has_galera_cluster_other_nodes() {
 #########################
 get_galera_cluster_address_value() {
     local cluster_address
-    if is_boolean_yes "$(get_galera_cluster_bootstrap_value)"; then
-        cluster_address="gcomm://"
-    else
+    if ! is_boolean_yes "$(get_galera_cluster_bootstrap_value)" && is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
         cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
+    else
+        cluster_address="gcomm://"
     fi
     debug "Set Galera cluster address to ${cluster_address}"
     echo "$cluster_address"
diff --git a/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh b/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
index 1ca7e5bb7e9b..61420de633c1 100644
--- a/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
+++ b/bitnami/mariadb-galera/10.6/debian-10/rootfs/opt/bitnami/scripts/libmariadbgalera.sh
@@ -181,10 +181,10 @@ has_galera_cluster_other_nodes() {
 #########################
 get_galera_cluster_address_value() {
     local cluster_address
-    if is_boolean_yes "$(get_galera_cluster_bootstrap_value)"; then
-        cluster_address="gcomm://"
-    else
+    if ! is_boolean_yes "$(get_galera_cluster_bootstrap_value)" && is_boolean_yes "$(has_galera_cluster_other_nodes)"; then
         cluster_address="$DB_GALERA_CLUSTER_ADDRESS"
+    else
+        cluster_address="gcomm://"
     fi
     debug "Set Galera cluster address to ${cluster_address}"
     echo "$cluster_address"