diff --git a/CHANGELOG.md b/CHANGELOG.md index 88511b5..d306006 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Adds time output to Aborting message (exit without change) - Checks for existance of Pi-hole binaries during validation - Less chatty about each step of configuration validation if it completes +- Less chatty about replication validation if it's not necessary #### 1.7.6 - Detects `dbclient` install as alternative to OpenSSH Client. diff --git a/gravity-sync.sh b/gravity-sync.sh index 28fb38d..f08cebd 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -599,7 +599,7 @@ function validate_os_sshpass { fi - MESSAGE="Validating SSH Connection to ${REMOTE_HOST}" + MESSAGE="Validating Connection to ${REMOTE_HOST}" echo_stat if hash ssh 2>/dev/null then @@ -612,7 +612,6 @@ function validate_os_sshpass { fi } - ## Detect SSH-KEYGEN function detect_sshkeygen { MESSAGE="Validating SSH-KEYGEN install on $HOSTNAME" @@ -738,12 +737,12 @@ function error_validate { function md5_compare { HASHMARK='0' - MESSAGE="Analyzing ${REMOTE_HOST} ${GRAVITY_FI}" + MESSAGE="Analyzing ${GRAVITY_FI} on ${REMOTE_HOST}" echo_stat primaryDBMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${PIHOLE_DIR}/${GRAVITY_FI}" | sed 's/\s.*$//') error_validate - MESSAGE="Analyzing $HOSTNAME ${GRAVITY_FI}" + MESSAGE="Analyzing ${GRAVITY_FI} on $HOSTNAME" echo_stat secondDBMD5=$(md5sum ${PIHOLE_DIR}/${GRAVITY_FI} | sed 's/\s.*$//') error_validate @@ -766,13 +765,13 @@ function md5_compare { if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${PIHOLE_DIR}/${CUSTOM_DNS} then REMOTE_CUSTOM_DNS="1" - MESSAGE="Analyzing ${REMOTE_HOST} ${CUSTOM_DNS}" + MESSAGE="Analyzing ${CUSTOM_DNS} on ${REMOTE_HOST}" echo_stat primaryCLMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${PIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//'") error_validate - MESSAGE="Analyzing $HOSTNAME ${CUSTOM_DNS}" + MESSAGE="Analyzing ${CUSTOM_DNS} on $HOSTNAME" echo_stat secondCLMD5=$(md5sum ${PIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//') error_validate