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

Merge pull request #12 from vmstan/development

Browse Source 
v1.3.3
This commit is contained in:
Michael Stanclift 2020-05-26 00:13:04 -05:00 committed by GitHub
commit f6c1398976
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -50,9 +50,9 @@ Download the latest release from [GitHub](https://github.com/vmstan/gravity-sync
``` ```
cd ~ cd ~
wget https://github.com/vmstan/gravity-sync/archive/v1.3.2.zip wget https://github.com/vmstan/gravity-sync/archive/v1.3.3.zip
unzip v1.3.2.zip unzip v1.3.3.zip
mv ~/gravity-sync-1.3.2 ~/gravity-sync mv ~/gravity-sync-1.3.3 ~/gravity-sync
cd gravity-sync cd gravity-sync
``` ```

31
gravity-sync.sh
View File

@ -2,7 +2,7 @@
# GRAVITY SYNC BY VMSTAN ##################### # GRAVITY SYNC BY VMSTAN #####################
PROGRAM='Gravity Sync' PROGRAM='Gravity Sync'
VERSION='1.3.1' VERSION='1.3.3'
# Must execute from a location in the home folder of the user who own's it (ex: /home/pi/gravity-sync) # Must execute from a location in the home folder of the user who own's it (ex: /home/pi/gravity-sync)
# Configure certificate based SSH authentication between the Pi-hole HA nodes - it does not use passwords # Configure certificate based SSH authentication between the Pi-hole HA nodes - it does not use passwords
@ -25,8 +25,9 @@ CRONJOB_LOG='gravity-sync.cron' # only used if cron is configured to output to t
BACKUP_FOLD='backup' # must exist as subdirectory in LOCAL_FOLD BACKUP_FOLD='backup' # must exist as subdirectory in LOCAL_FOLD
# PH Folder/File Locations # PH Folder/File Locations
PIHOLE_DIR='/etc/pihole' # default install directory PIHOLE_DIR='/etc/pihole' # default PH data directory
GRAVITY_FI='gravity.db' # this should not change GRAVITY_FI='gravity.db' # this should not change
PIHOLE_BIN='/usr/local/bin/pihole' # default PH binary directory
############################################## ##############################################
### DO NOT CHANGE ANYTHING BELOW THIS LINE ### ### DO NOT CHANGE ANYTHING BELOW THIS LINE ###
@ -130,16 +131,18 @@ function pull_gs {
sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate error_validate
sleep 3 MESSAGE="Pausing One Second"
echo -e "${INFO} ${MESSAGE}"
sleep 1
MESSAGE="Updating FTLDNS Configuration" MESSAGE="Updating FTLDNS Configuration"
echo -en "${STAT} ${MESSAGE}" echo -en "${STAT} ${MESSAGE}"
pihole restartdns reloadlists >/dev/null 2>&1 ${PIHOLE_BIN} restartdns reloadlists >/dev/null 2>&1
error_validate error_validate
MESSAGE="Reloading FTLDNS Services" MESSAGE="Reloading FTLDNS Services"
echo -en "${STAT} ${MESSAGE}" echo -en "${STAT} ${MESSAGE}"
pihole restartdns >/dev/null 2>&1 ${PIHOLE_BIN} restartdns >/dev/null 2>&1
error_validate error_validate
logs_export logs_export
@ -178,16 +181,18 @@ function push_gs {
${SSHPASSWORD} ssh ${REMOTE_USER}@${REMOTE_HOST} "sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI}" >/dev/null 2>&1 ${SSHPASSWORD} ssh ${REMOTE_USER}@${REMOTE_HOST} "sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI}" >/dev/null 2>&1
error_validate error_validate
sleep 3 MESSAGE="Pausing One Second"
echo -e "${INFO} ${MESSAGE}"
sleep 1
MESSAGE="Updating FTLDNS Configuration" MESSAGE="Updating FTLDNS Configuration"
echo -en "${STAT} ${MESSAGE}" echo -en "${STAT} ${MESSAGE}"
${SSHPASSWORD} ssh ${REMOTE_USER}@${REMOTE_HOST} 'pihole restartdns reloadlists' >/dev/null 2>&1 ${SSHPASSWORD} ssh ${REMOTE_USER}@${REMOTE_HOST} '${PIHOLE_BIN} restartdns reloadlists' >/dev/null 2>&1
error_validate error_validate
MESSAGE="Reloading FTLDNS Services" MESSAGE="Reloading FTLDNS Services"
echo -en "${STAT} ${MESSAGE}" echo -en "${STAT} ${MESSAGE}"
${SSHPASSWORD} ssh ${REMOTE_USER}@${REMOTE_HOST} 'pihole restartdns' >/dev/null 2>&1 ${SSHPASSWORD} ssh ${REMOTE_USER}@${REMOTE_HOST} '${PIHOLE_BIN} restartdns' >/dev/null 2>&1
error_validate error_validate
logs_export logs_export
@ -220,22 +225,22 @@ function show_crontab {
CRONPATH="$HOME/${LOCAL_FOLDR}/${CRONJOB_LOG}" CRONPATH="$HOME/${LOCAL_FOLDR}/${CRONJOB_LOG}"
MESSAGE="Replaying Last Cronjob" MESSAGE="Replaying Last Cronjob"
echo -e "${STAT} ${MESSAGE}" echo -en "${STAT} ${MESSAGE}"
if [ -f ${CRONPATH} ] if [ -f ${CRONPATH} ]
then then
if [ -s ${CRONPATH} ] if [ -s ${CRONPATH} ]
echo -e "${GOOD} ${MESSAGE}" echo -e "\r${GOOD} ${MESSAGE}"
logs_crontab logs_crontab
exit_nochange exit_nochange
then then
echo -e "${FAIL} ${MESSAGE}" echo -e "\r${FAIL} ${MESSAGE}"
echo -e "${INFO} ${CRONPATH} appears empty" echo -e "${INFO} ${CRONPATH} appears empty"
exit_nochange exit_nochange
fi fi
else else
echo -e "${FAIL} ${MESSAGE}" echo -e "\r${FAIL} ${MESSAGE}"
echo -e "${YELLOW}${CRONPATH}${NC} cannot be located" echo -e "${INFO} ${CRONPATH} cannot be located"
exit_nochange exit_nochange
fi fi
} }