Cutlery/gravity-sync
1
0
Fork 0
mirror of https://github.com/vmstan/gravity-sync.git synced 2025-11-04 01:26:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Less chatty about replication validation

Browse Source
This commit is contained in:
Michael Stanclift 2020-06-02 11:23:21 -05:00
parent c0c4009825
commit 1a00f1e57c
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gravity-sync.sh
View File

@ -580,21 +580,24 @@ function validate_os_sshpass {
MESSAGE="Using SSH Key-Pair Authentication" MESSAGE="Using SSH Key-Pair Authentication"
else else
timeout 5 ssh -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1 timeout 5 ssh -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1
if [ "$?" != "0" ]; then if [ "$?" != "0" ]
then
SSHPASSWORD="sshpass -p ${REMOTE_PASS}" SSHPASSWORD="sshpass -p ${REMOTE_PASS}"
MESSAGE="Using SSH Password Authentication" MESSAGE="Using SSH Password Authentication"
echo_warn
else else
SSHPASSWORD='' SSHPASSWORD=''
MESSAGE="Using SSH Key-Pair Authentication" MESSAGE="Using SSH Key-Pair Authentication"
fi
fi
else
SSHPASSWORD=''
MESSAGE="Using SSH Key-Pair Authentication"
fi
echo_info echo_info
fi
fi
else
SSHPASSWORD=''
MESSAGE="Using SSH Key-Pair Authentication"
echo_info
fi
MESSAGE="Validating SSH Connection to ${REMOTE_HOST}" MESSAGE="Validating SSH Connection to ${REMOTE_HOST}"
echo_stat echo_stat
@ -604,7 +607,6 @@ function validate_os_sshpass {
error_validate error_validate
elif hash dbclient 2>/dev/null elif hash dbclient 2>/dev/null
then then
# if [ "$SSH_CMD" = "dbclient" ]; then echo ''; fi;
timeout 5 ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1 timeout 5 ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1
error_validate error_validate
fi fi
@ -674,17 +676,17 @@ function distro_check {
## Detect SSH & RSYNC ## Detect SSH & RSYNC
function detect_ssh { function detect_ssh {
MESSAGE="Validating SSH on $HOSTNAME" MESSAGE="Validating SSH Client on $HOSTNAME"
echo_stat echo_stat
if hash ssh 2>/dev/null if hash ssh 2>/dev/null
then then
MESSAGE="Validating SSH on $HOSTNAME (OpenSSH)" MESSAGE="${MESSAGE} (OpenSSH)"
echo_good echo_good
SSH_CMD='ssh' SSH_CMD='ssh'
elif hash dbclient 2>/dev/null elif hash dbclient 2>/dev/null
then then
MESSAGE="Validating SSH on $HOSTNAME (Dropbear)" MESSAGE="${MESSAGE} (Dropbear)"
echo_good echo_good
SSH_CMD='dbclient' SSH_CMD='dbclient'
else else
@ -699,7 +701,7 @@ function detect_ssh {
error_validate error_validate
fi fi
MESSAGE="Validating RSYNC on $HOSTNAME" MESSAGE="Validating RSYNC Installed on $HOSTNAME"
echo_stat echo_stat
if hash rsync 2>/dev/null if hash rsync 2>/dev/null
@ -748,11 +750,11 @@ function md5_compare {
if [ "$primaryDBMD5" == "$secondDBMD5" ] if [ "$primaryDBMD5" == "$secondDBMD5" ]
then then
MESSAGE="${GRAVITY_FI} Identical" # MESSAGE="Identical ${GRAVITY_FI} Detected"
echo_info # echo_info
HASHMARK=$((HASHMARK+0)) HASHMARK=$((HASHMARK+0))
else else
MESSAGE="${GRAVITY_FI} Differenced" MESSAGE="Differenced ${GRAVITY_FI} Detected"
echo_warn echo_warn
HASHMARK=$((HASHMARK+1)) HASHMARK=$((HASHMARK+1))
fi fi
@ -777,11 +779,11 @@ function md5_compare {
if [ "$primaryCLMD5" == "$secondCLMD5" ] if [ "$primaryCLMD5" == "$secondCLMD5" ]
then then
MESSAGE="${CUSTOM_DNS} Identical" # MESSAGE="${CUSTOM_DNS} Identical"
echo_info # echo_info
HASHMARK=$((HASHMARK+0)) HASHMARK=$((HASHMARK+0))
else else
MESSAGE="${CUSTOM_DNS} Differenced" MESSAGE="Differenced ${CUSTOM_DNS} Detected"
echo_warn echo_warn
HASHMARK=$((HASHMARK+1)) HASHMARK=$((HASHMARK+1))
fi fi
@ -807,7 +809,7 @@ function md5_compare {
echo_warn echo_warn
HASHMARK=$((HASHMARK+0)) HASHMARK=$((HASHMARK+0))
else else
MESSAGE="No Changes to Replicate" MESSAGE="No Replication Required"
echo_info echo_info
exit_nochange exit_nochange
fi fi