Merge pull request #309 from dOpensource/v0.64

V0.64
dOpensource · Nov 27, 2020 · b82146c · b82146c
2 parents 3558688 + 86f9fc5
commit b82146c
Show file tree

Hide file tree

Showing 55 changed files with 3,416 additions and 964 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -16,6 +16,7 @@
 - ncannon01
 - Nicole
 - Omari S. King
+- reqlez
 - richard
 - Richard
 - Richard Bolaji

diff --git a/HA/mysql/installAAGaleraReplication.sh b/HA/mysql/installAAGaleraReplication.sh
@@ -452,7 +452,7 @@ EOF
 
                 # on CentOS mariadb fresh install doesn't have socket connection
                 # we need this to allow unix socket as fallback (parsed last in configs)
-                if ! grep -q '\[mysqld\]' /etc/my.cnf; then
+                if ! grep -q '\[mysqld\]' /etc/my.cnf 2>/dev/null; then
                     (cat <<'EOF'
 [mysqld]
 user                = mysql
@@ -527,7 +527,7 @@ EOF
 
             # on CentOS mariadb fresh install doesn't have socket connection
             # we need this to allow unix socket as fallback (parsed last in configs)
-            if ! grep -q '\[mysqld\]' /etc/my.cnf; then
+            if ! grep -q '\[mysqld\]' /etc/my.cnf 2>/dev/null; then
                 (cat <<'EOF'
 [mysqld]
 user                = mysql

diff --git a/HA/pacemaker/installKamCluster.sh b/HA/pacemaker/installKamCluster.sh
@@ -298,7 +298,7 @@ for NODE in ${ARGS[@]}; do
         { printerr "could not change hacluster user password"; exit 1; }
 
     # hostnames are required even if not DNS resolvable (on each node)
-    if ! grep -q -E \$(join '|' \${HOST_LIST[@]}) /etc/hosts; then
+    if ! grep -q -E \$(join '|' \${HOST_LIST[@]}) /etc/hosts 2>/dev/null; then
         i=0
         while (( \$i < \${#HOST_LIST[@]} )); do
             printf '%s\n' "\${HOST_LIST[\$i]}    \${NODE_NAMES[\$i]}" >> /etc/hosts