Uses backup directory for Gravity.db shuffle

This commit is contained in:
Michael Stanclift 2020-05-22 15:43:04 -05:00
parent 304180b504
commit 8de355618b

View File

@ -20,6 +20,7 @@ VERSION='1.2.3'
LOCAL_FOLDR='gravity-sync' # must exist in running user home folder LOCAL_FOLDR='gravity-sync' # must exist in running user home folder
CONFIG_FILE='gravity-sync.conf' # must exist as explained above CONFIG_FILE='gravity-sync.conf' # must exist as explained above
SYNCING_LOG='gravity-sync.log' # will be created in above folder SYNCING_LOG='gravity-sync.log' # will be created in above folder
BACKUP_FOLD='backup'
# PH Folder/File Locations # PH Folder/File Locations
PIHOLE_DIR='/etc/pihole' # default install directory PIHOLE_DIR='/etc/pihole' # default install directory
@ -67,19 +68,19 @@ function update_gs {
function pull_gs { function pull_gs {
TASKTYPE='PULL' TASKTYPE='PULL'
echo -e "[${CYAN}STAT${NC}] Copying ${GRAVITY_FI} from ${REMOTE_HOST}" echo -e "[${CYAN}STAT${NC}] Copying ${GRAVITY_FI} from ${REMOTE_HOST}"
rsync -v --progress -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} ~/${LOCAL_FOLDR}/${GRAVITY_FI} rsync -v --progress -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} ~/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.last
echo -e "[${CYAN}STAT${NC}] Backup Current ${GRAVITY_FI} on $HOSTNAME" echo -e "[${CYAN}STAT${NC}] Backing Up Current ${GRAVITY_FI} on $HOSTNAME"
sudo mv -v ${PIHOLE_DIR}/${GRAVITY_FI} ${PIHOLE_DIR}/${GRAVITY_FI}.backup sudo mv -v ${PIHOLE_DIR}/${GRAVITY_FI} ~/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.backup
echo -e "[${CYAN}STAT${NC}] Replacing ${GRAVITY_FI} on $HOSTNAME" echo -e "[${CYAN}STAT${NC}] Replacing ${GRAVITY_FI} on $HOSTNAME"
sudo cp -v ~/${LOCAL_FOLDR}/${GRAVITY_FI} ${PIHOLE_DIR} sudo cp -v ~/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.last ${PIHOLE_DIR}/${GRAVITY_FI}
sudo chmod 644 ${PIHOLE_DIR}/${GRAVITY_FI} sudo chmod 644 ${PIHOLE_DIR}/${GRAVITY_FI}
sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI} sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI}
echo -e "${GRAVITY_FI} ownership and file permissions reset" echo -e "${GRAVITY_FI} ownership and file permissions reset"
echo -e "[${CYAN}STAT${NC}] Reloading FTLDNS Configuration" echo -e "[${CYAN}STAT${NC}] Reloading FTLDNS Configuration"
pihole restartdns reloadlists pihole restartdns reloadlists
pihole restartdns pihole restartdns
echo -e "[${CYAN}STAT${NC}] Archiving Latest ${GRAVITY_FI}" # echo -e "[${CYAN}STAT${NC}] Archiving Latest ${GRAVITY_FI}"
mv -v ~/${LOCAL_FOLDR}/${GRAVITY_FI} ~/${LOCAL_FOLDR}/${GRAVITY_FI}.last # mv -v ~/${LOCAL_FOLDR}/${GRAVITY_FI} ~/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.last
logs_export logs_export
exit_withchange exit_withchange
} }