From 217efbfb8bb06d34e2a68178e5ef2d4ee40c64ad Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 10:32:52 -0500 Subject: [PATCH 01/17] Validate gravity.db owner --- gravity-sync.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gravity-sync.sh b/gravity-sync.sh index 1159eb9..e004aa7 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -131,6 +131,16 @@ function pull_gs { sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 error_validate + MESSAGE="Validating Ownership on ${GRAVITY_FI}" + echo -en "${STAT} ${MESSAGE}" + GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk '{print $3}') + if $GRAVDB_OWN = 'pihole' + then + echo -e "\r${GOOD} ${MESSAGE}" + else + echo -e "\r${FAIL} ${MESSAGE}" + fi + MESSAGE="Pausing One Second" echo -e "${INFO} ${MESSAGE}" sleep 1 From b0b978ff5d3a6150ee408f08320169e088041c91 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 10:38:15 -0500 Subject: [PATCH 02/17] Update gravity-sync.sh --- gravity-sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index e004aa7..1217605 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -133,7 +133,7 @@ function pull_gs { MESSAGE="Validating Ownership on ${GRAVITY_FI}" echo -en "${STAT} ${MESSAGE}" - GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk '{print $3}') + GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk '\{print $3\}') if $GRAVDB_OWN = 'pihole' then echo -e "\r${GOOD} ${MESSAGE}" From a224f01dab564506e215f5e599b8be380ec16c12 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 10:43:56 -0500 Subject: [PATCH 03/17] Update gravity-sync.sh --- gravity-sync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 1217605..8a4a9be 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -133,8 +133,8 @@ function pull_gs { MESSAGE="Validating Ownership on ${GRAVITY_FI}" echo -en "${STAT} ${MESSAGE}" - GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk '\{print $3\}') - if $GRAVDB_OWN = 'pihole' + GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk '{print $3 $4}') + if $GRAVDB_OWN = 'piholepihole' then echo -e "\r${GOOD} ${MESSAGE}" else From ad5696c2465de6f2b6eae7c4aea19b7c03651fa8 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 10:51:26 -0500 Subject: [PATCH 04/17] Update gravity-sync.sh --- gravity-sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 8a4a9be..32edcf6 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -134,7 +134,7 @@ function pull_gs { MESSAGE="Validating Ownership on ${GRAVITY_FI}" echo -en "${STAT} ${MESSAGE}" GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk '{print $3 $4}') - if $GRAVDB_OWN = 'piholepihole' + if [ $GRAVDB_OWN == "piholepihole" ] then echo -e "\r${GOOD} ${MESSAGE}" else From 43c336f85f3e20676f316dfb4b2fc8062bb58633 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 11:32:30 -0500 Subject: [PATCH 05/17] Validate gravity.db write permissions --- gravity-sync.sh | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 32edcf6..346e2d7 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -106,6 +106,8 @@ function pull_gs { echo -e "${INFO} ${TASKTYPE} Requested" md5_compare + echo -e "${INFO} ${TASKTYPE} Commencing" + MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}" echo -en "${STAT} ${MESSAGE}" ${SSHPASSWORD} rsync -v -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull >/dev/null 2>&1 @@ -120,27 +122,45 @@ function pull_gs { echo -en "${STAT} ${MESSAGE}" sudo cp -v $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 error_validate - - MESSAGE="Setting Permissions on ${GRAVITY_FI}" - echo -en "${STAT} ${MESSAGE}" - sudo chmod 644 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 - error_validate - - MESSAGE="Setting Ownership on ${GRAVITY_FI}" - echo -en "${STAT} ${MESSAGE}" - sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 - error_validate MESSAGE="Validating Ownership on ${GRAVITY_FI}" - echo -en "${STAT} ${MESSAGE}" + echo -en "${STAT} ${MESSAGE}" + GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk '{print $3 $4}') if [ $GRAVDB_OWN == "piholepihole" ] then echo -e "\r${GOOD} ${MESSAGE}" else - echo -e "\r${FAIL} ${MESSAGE}" + echo -e "\r${FAIL} $MESSAGE" + + MESSAGE2="Attempting to Compensate" + echo -e "${INFO} ${MESSAGE2}" + + MESSAGE="Setting Ownership on ${GRAVITY_FI}" + echo -en "${STAT} ${MESSAGE}" + sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 + error_validate fi + MESSAGE="Validating Permissions on ${GRAVITY_FI}" + echo -en "${STAT} ${MESSAGE}" + + if [ ! -w "${PIHOLE_DIR}/${GRAVITY_FI}" ] + then + echo -e "\r${FAIL} $MESSAGE" + + MESSAGE2="Attempting to Compensate" + sudo chmod 644 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 + error_validate + else + echo -e "\r${GOOD} ${MESSAGE}" + fi + + # MESSAGE="Setting Permissions on ${GRAVITY_FI}" + # echo -en "${STAT} ${MESSAGE}" + # sudo chmod 644 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 + # error_validate + MESSAGE="Pausing One Second" echo -e "${INFO} ${MESSAGE}" sleep 1 From 94d8c747573713e6658bbbd9b09cf0ebc9ab6072 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 11:34:15 -0500 Subject: [PATCH 06/17] Update gravity-sync.sh --- gravity-sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 346e2d7..1f63a45 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -145,7 +145,7 @@ function pull_gs { MESSAGE="Validating Permissions on ${GRAVITY_FI}" echo -en "${STAT} ${MESSAGE}" - if [ ! -w "${PIHOLE_DIR}/${GRAVITY_FI}" ] + if [ ! u-w "${PIHOLE_DIR}/${GRAVITY_FI}" ] then echo -e "\r${FAIL} $MESSAGE" From 85da9aa8f8b90f4e0ce8cae070ab86973950fd4a Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 11:43:12 -0500 Subject: [PATCH 07/17] New way to validate permissions --- gravity-sync.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 1f63a45..6e299b4 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -145,15 +145,19 @@ function pull_gs { MESSAGE="Validating Permissions on ${GRAVITY_FI}" echo -en "${STAT} ${MESSAGE}" - if [ ! u-w "${PIHOLE_DIR}/${GRAVITY_FI}" ] + GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep ${GRAVITY_FI} | awk '{print $1}' ) + if [ $GRAVDB_RWE "-rw-r--r--" ] then + echo -e "\r${GOOD} ${MESSAGE}" + else echo -e "\r${FAIL} $MESSAGE" - + MESSAGE2="Attempting to Compensate" + + MESSAGE="Setting Ownership on ${GRAVITY_FI}" + echo -en "${STAT} ${MESSAGE}" sudo chmod 644 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 error_validate - else - echo -e "\r${GOOD} ${MESSAGE}" fi # MESSAGE="Setting Permissions on ${GRAVITY_FI}" From 078a050efe00df5305c79df1f1085e8d36164f8b Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 11:44:02 -0500 Subject: [PATCH 08/17] Missing operator --- gravity-sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 6e299b4..8e69624 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -146,7 +146,7 @@ function pull_gs { echo -en "${STAT} ${MESSAGE}" GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep ${GRAVITY_FI} | awk '{print $1}' ) - if [ $GRAVDB_RWE "-rw-r--r--" ] + if [ $GRAVDB_RWE == "-rw-r--r--" ] then echo -e "\r${GOOD} ${MESSAGE}" else From fed01efbff43713d2ccdebe60307d82debfbd968 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 11:47:04 -0500 Subject: [PATCH 09/17] Update gravity-sync.sh --- gravity-sync.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 8e69624..d97edbb 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -145,14 +145,15 @@ function pull_gs { MESSAGE="Validating Permissions on ${GRAVITY_FI}" echo -en "${STAT} ${MESSAGE}" - GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep ${GRAVITY_FI} | awk '{print $1}' ) + GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep ${GRAVITY_FI} | awk '{print $1}') if [ $GRAVDB_RWE == "-rw-r--r--" ] then echo -e "\r${GOOD} ${MESSAGE}" else - echo -e "\r${FAIL} $MESSAGE" + echo -e "\r${FAIL} ${MESSAGE}" MESSAGE2="Attempting to Compensate" + echo -e "${INFO} ${MESSAGE2}" MESSAGE="Setting Ownership on ${GRAVITY_FI}" echo -en "${STAT} ${MESSAGE}" From 0ac26f1e8c8067fa632ec0226e882449a0e45b71 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 11:52:28 -0500 Subject: [PATCH 10/17] Update gravity-sync.sh --- gravity-sync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index d97edbb..0412a0d 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -145,7 +145,7 @@ function pull_gs { MESSAGE="Validating Permissions on ${GRAVITY_FI}" echo -en "${STAT} ${MESSAGE}" - GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep ${GRAVITY_FI} | awk '{print $1}') + GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep -v f: | grep ${GRAVITY_FI} | awk '{print $1}') if [ $GRAVDB_RWE == "-rw-r--r--" ] then echo -e "\r${GOOD} ${MESSAGE}" @@ -157,7 +157,7 @@ function pull_gs { MESSAGE="Setting Ownership on ${GRAVITY_FI}" echo -en "${STAT} ${MESSAGE}" - sudo chmod 644 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 + sudo chmod 644 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 error_validate fi From aeb392fffe2193aac028297ad73cf9ba089b45b2 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 11:54:47 -0500 Subject: [PATCH 11/17] Update gravity-sync.sh --- gravity-sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 0412a0d..b99aa39 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -146,7 +146,7 @@ function pull_gs { echo -en "${STAT} ${MESSAGE}" GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep -v f: | grep ${GRAVITY_FI} | awk '{print $1}') - if [ $GRAVDB_RWE == "-rw-r--r--" ] + if [ $GRAVDB_RWE = "-rw-r--r--" ] then echo -e "\r${GOOD} ${MESSAGE}" else From e1d2b9807482c18b0a4b537f989469c91d0b09cc Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 12:07:09 -0500 Subject: [PATCH 12/17] Star Trek reference I'm surprised it took me this long to realize this is a thing I should be doing --- gravity-sync.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index b99aa39..3eb15f5 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -161,12 +161,7 @@ function pull_gs { error_validate fi - # MESSAGE="Setting Permissions on ${GRAVITY_FI}" - # echo -en "${STAT} ${MESSAGE}" - # sudo chmod 644 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 - # error_validate - - MESSAGE="Pausing One Second" + MESSAGE="Inverting Tachyon Pulse" echo -e "${INFO} ${MESSAGE}" sleep 1 From 143371943a15bdc6e0a49c191ed47d69a31ef564 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 12:14:32 -0500 Subject: [PATCH 13/17] Implemented Jim rsync Preserve permissions and backup in one line --- gravity-sync.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 3eb15f5..8627282 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -108,21 +108,16 @@ function pull_gs { echo -e "${INFO} ${TASKTYPE} Commencing" - MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}" - echo -en "${STAT} ${MESSAGE}" - ${SSHPASSWORD} rsync -v -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull >/dev/null 2>&1 - error_validate - MESSAGE="Backing Up ${GRAVITY_FI} on $HOSTNAME" echo -en "${STAT} ${MESSAGE}" cp -v ${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.backup >/dev/null 2>&1 error_validate - MESSAGE="Replacing ${GRAVITY_FI} on $HOSTNAME" - echo -en "${STAT} ${MESSAGE}" - sudo cp -v $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 + MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}" + echo -en "${STAT} ${MESSAGE}" + ${SSHPASSWORD} rsync -pog -b --backup-dir=$HOME/${LOCAL_FOLDR}/${BACKUP_FOLD} --suffix=.pull -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} ${PIHOLE_DIR} >/dev/null 2>&1 error_validate - + MESSAGE="Validating Ownership on ${GRAVITY_FI}" echo -en "${STAT} ${MESSAGE}" From 15451b32f2f61a5575a3a12043f99ab1ce0bf9ef Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 12:26:21 -0500 Subject: [PATCH 14/17] Reverting Jim's method Keeping backup before pull for safety --- gravity-sync.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 8627282..11eb3c7 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -115,7 +115,12 @@ function pull_gs { MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}" echo -en "${STAT} ${MESSAGE}" - ${SSHPASSWORD} rsync -pog -b --backup-dir=$HOME/${LOCAL_FOLDR}/${BACKUP_FOLD} --suffix=.pull -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} ${PIHOLE_DIR} >/dev/null 2>&1 + ${SSHPASSWORD} rsync -v -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull >/dev/null 2>&1 + error_validate + + MESSAGE="Replacing ${GRAVITY_FI} on $HOSTNAME" + echo -en "${STAT} ${MESSAGE}" + sudo cp -v $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 error_validate MESSAGE="Validating Ownership on ${GRAVITY_FI}" From e6aebce656594ce2c5feb04412bf1460734da807 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 12:30:00 -0500 Subject: [PATCH 15/17] Quieter output --- gravity-sync.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 11eb3c7..3310148 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -110,17 +110,17 @@ function pull_gs { MESSAGE="Backing Up ${GRAVITY_FI} on $HOSTNAME" echo -en "${STAT} ${MESSAGE}" - cp -v ${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.backup >/dev/null 2>&1 + cp ${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.backup >/dev/null 2>&1 error_validate MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}" echo -en "${STAT} ${MESSAGE}" - ${SSHPASSWORD} rsync -v -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull >/dev/null 2>&1 + ${SSHPASSWORD} rsync -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull >/dev/null 2>&1 error_validate MESSAGE="Replacing ${GRAVITY_FI} on $HOSTNAME" echo -en "${STAT} ${MESSAGE}" - sudo cp -v $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 + sudo cp $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 error_validate MESSAGE="Validating Ownership on ${GRAVITY_FI}" From c7c1ed2a3a6a1a294e7393dd443e6d3db9efefa7 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 12:32:11 -0500 Subject: [PATCH 16/17] Another Trek reference --- gravity-sync.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 3310148..be99b83 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -163,7 +163,7 @@ function pull_gs { MESSAGE="Inverting Tachyon Pulse" echo -e "${INFO} ${MESSAGE}" - sleep 1 + sleep 1 MESSAGE="Updating FTLDNS Configuration" echo -en "${STAT} ${MESSAGE}" @@ -193,12 +193,12 @@ function push_gs { MESSAGE="Backing Up ${GRAVITY_FI} from ${REMOTE_HOST}" echo -en "${STAT} ${MESSAGE}" - ${SSHPASSWORD} rsync -v -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.push >/dev/null 2>&1 + ${SSHPASSWORD} rsync -e 'ssh -p 22' ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.push >/dev/null 2>&1 error_validate MESSAGE="Pushing ${GRAVITY_FI} to ${REMOTE_HOST}" echo -en "${STAT} ${MESSAGE}" - ${SSHPASSWORD} rsync --rsync-path="sudo rsync" -v -e 'ssh -p 22' ${PIHOLE_DIR}/${GRAVITY_FI} ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 + ${SSHPASSWORD} rsync --rsync-path="sudo rsync" -e 'ssh -p 22' ${PIHOLE_DIR}/${GRAVITY_FI} ${REMOTE_USER}@${REMOTE_HOST}:${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 error_validate MESSAGE="Setting Permissions on ${GRAVITY_FI}" @@ -211,9 +211,9 @@ function push_gs { ${SSHPASSWORD} ssh ${REMOTE_USER}@${REMOTE_HOST} "sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI}" >/dev/null 2>&1 error_validate - MESSAGE="Pausing One Second" + MESSAGE="Contacting Borg Collective" echo -e "${INFO} ${MESSAGE}" - sleep 1 + sleep 1 MESSAGE="Updating FTLDNS Configuration" echo -en "${STAT} ${MESSAGE}" From c7eeabb38a900bdd63cb19895d02d80f7ed0004b Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 26 May 2020 13:23:42 -0500 Subject: [PATCH 17/17] v1.3.4 --- README.md | 6 +++--- gravity-sync.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3e90cd1..7e99d67 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,9 @@ Download the latest release from [GitHub](https://github.com/vmstan/gravity-sync ``` cd ~ -wget https://github.com/vmstan/gravity-sync/archive/v1.3.3.zip -unzip v1.3.3.zip -mv ~/gravity-sync-1.3.3 ~/gravity-sync +wget https://github.com/vmstan/gravity-sync/archive/v1.3.4.zip +unzip v1.3.4.zip +mv ~/gravity-sync-1.3.4 ~/gravity-sync cd gravity-sync ``` diff --git a/gravity-sync.sh b/gravity-sync.sh index be99b83..d329f65 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -2,7 +2,7 @@ # GRAVITY SYNC BY VMSTAN ##################### PROGRAM='Gravity Sync' -VERSION='1.3.3' +VERSION='1.3.4' # 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