Mirrored_Repos/gravity-sync
1
0
Fork 0
mirror of https://github.com/vmstan/gravity-sync.git synced 2024-08-30 18:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix missing custom list detection

Browse Source
This commit is contained in:
Michael Stanclift 2020-08-18 09:51:38 -05:00
parent 4aa301f179
commit 8d7a61ca55
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
gravity-sync.sh
View File

@ -216,14 +216,6 @@ function pull_gs_cust {
then then
if [ "$REMOTE_CUSTOM_DNS" == "1" ] if [ "$REMOTE_CUSTOM_DNS" == "1" ]
then then
# if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ]
# then
# MESSAGE="Backing Up ${CUSTOM_DNS} on $HOSTNAME"
# echo_stat
# cp ${PIHOLE_DIR}/${CUSTOM_DNS} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${CUSTOM_DNS}.backup >/dev/null 2>&1
# error_validate
# fi
MESSAGE="Pulling ${CUSTOM_DNS} from ${REMOTE_HOST}" MESSAGE="Pulling ${CUSTOM_DNS} from ${REMOTE_HOST}"
echo_stat echo_stat
RSYNC_REPATH="rsync" RSYNC_REPATH="rsync"
@ -501,40 +493,48 @@ function smart_gs {
SECCLCHANGE="1" SECCLCHANGE="1"
fi fi
if [ "${PRICLCHANGE}" == "${SECCLCHANGE}" ] if [ "$SKIP_CUSTOM" != '1' ]
then then
if [ "${PRICLCHANGE}" != "0" ]
if [ -f "${PIHOLE_DIR}/${CUSTOM_DNS}" ]
then then
MESSAGE="Both ${CUSTOM_DNS} Changed"
echo_warn
PRICLDATE=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "stat -c %Y ${PIHOLE_DIR}/${CUSTOM_DNS}") if [ "${PRICLCHANGE}" == "${SECCLCHANGE}" ]
SECCLDATE=$(stat -c %Y ${PIHOLE_DIR}/${CUSTOM_DNS}) then
if [ "${PRICLCHANGE}" != "0" ]
if [ "${PRICLDATE}" -gt "$SECCLDATE" ]
then then
MESSAGE="Primary ${CUSTOM_DNS} Last Changed" MESSAGE="Both ${CUSTOM_DNS} Changed"
echo_info echo_warn
PRICLDATE=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "stat -c %Y ${PIHOLE_DIR}/${CUSTOM_DNS}")
SECCLDATE=$(stat -c %Y ${PIHOLE_DIR}/${CUSTOM_DNS})
if [ "${PRICLDATE}" -gt "${SECCLDATE}" ]
then
MESSAGE="Primary ${CUSTOM_DNS} Last Changed"
echo_info
pull_gs_cust
PULLRESTART="1"
else
MESSAGE="Secondary ${CUSTOM_DNS} Last Changed"
echo_info
push_gs_cust
PUSHRESTART="1"
fi
fi
else
if [ "${PRICLCHANGE}" != "0" ]
then
pull_gs_cust pull_gs_cust
PULLRESTART="1" PULLRESTART="1"
else elif [ "${SECCLCHANGE}" != "0" ]
MESSAGE="Secondary ${CUSTOM_DNS} Last Changed" then
echo_info
push_gs_cust push_gs_cust
PUSHRESTART="1" PUSHRESTART="1"
fi fi
fi fi
else
if [ "${PRICLCHANGE}" != "0" ]
then
pull_gs_cust
PULLRESTART="1"
elif [ "${SECCLCHANGE}" != "0" ]
then
push_gs_cust
PUSHRESTART="1"
fi fi
fi fi