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

Added logging types and logging to push and update

Browse Source
This commit is contained in:
Michael Stanclift 2020-05-22 11:50:42 -05:00
parent acef849de4
commit f06bdd347a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gravity-sync.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Gravity Sync by vmstan # Gravity Sync by vmstan
VERSION='1.2.0' VERSION='1.2.1'
# 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 Pihole HA nodes - it does not use passwords # Configure certificate based SSH authentication between the Pihole HA nodes - it does not use passwords
@ -47,9 +47,12 @@ function import_gs {
# Update Function # Update Function
function update_gs { function update_gs {
TASKTYPE='UPDATE'
echo -e "${YELLOW}This update will fail if Gravity Sync was not installed via GitHub${NC}" echo -e "${YELLOW}This update will fail if Gravity Sync was not installed via GitHub${NC}"
git reset --hard git reset --hard
git pull git pull
logs_export
exit
} }
# Pull Function # Pull Function
@ -69,12 +72,14 @@ function pull_gs {
pihole restartdns pihole restartdns
echo -e "${CYAN}Retaining additional copy of remote ${GRAVITY_FI}${NC}" echo -e "${CYAN}Retaining additional copy of remote ${GRAVITY_FI}${NC}"
mv -v ~/${LOCAL_FOLDR}/${GRAVITY_FI} ~/${LOCAL_FOLDR}/${GRAVITY_FI}.last mv -v ~/${LOCAL_FOLDR}/${GRAVITY_FI} ~/${LOCAL_FOLDR}/${GRAVITY_FI}.last
logs_export
echo -e "${GREEN}gravity.db pull completed${NC}" echo -e "${GREEN}gravity.db pull completed${NC}"
logs_export
exit
} }
# Push Function # Push Function
function push_gs { function push_gs {
TASKTYPE='PUSH'
echo -e "${YELLOW}WARNING: DATA LOSS IS POSSIBLE${NC}" echo -e "${YELLOW}WARNING: DATA LOSS IS POSSIBLE${NC}"
echo -e "This will send the running ${GRAVITY_FI} from this server to your primary Pihole" echo -e "This will send the running ${GRAVITY_FI} from this server to your primary Pihole"
echo -e "No backup copies are made on the primary Pihole before or after executing this command!" echo -e "No backup copies are made on the primary Pihole before or after executing this command!"
@ -92,6 +97,7 @@ function push_gs {
ssh ${REMOTE_USER}@${REMOTE_HOST} 'pihole restartdns reloadlists' ssh ${REMOTE_USER}@${REMOTE_HOST} 'pihole restartdns reloadlists'
ssh ${REMOTE_USER}@${REMOTE_HOST} 'pihole restartdns' ssh ${REMOTE_USER}@${REMOTE_HOST} 'pihole restartdns'
echo -e "${GREEN}gravity.db push completed${NC}" echo -e "${GREEN}gravity.db push completed${NC}"
logs_export
exit exit
;; ;;
@ -114,7 +120,7 @@ function logs_gs {
function logs_export { function logs_export {
echo -e "Logging timestamps to ${SYNCING_LOG}" echo -e "Logging timestamps to ${SYNCING_LOG}"
# date >> ~/${LOCAL_FOLDR}/${SYNCING_LOG} # date >> ~/${LOCAL_FOLDR}/${SYNCING_LOG}
echo -e $(date -u) " [${TASKTYPE}]" >> ~/${LOCAL_FOLDR}/${SYNCING_LOG} echo -e $(date) "[${TASKTYPE}]" >> ~/${LOCAL_FOLDR}/${SYNCING_LOG}
} }
# Validate Functions # Validate Functions