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

Less chatty about file validation

Browse Source
This commit is contained in:
Michael Stanclift 2020-06-02 11:52:07 -05:00
parent 7665834caf
commit e45fde8e8a
2 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@
- Checks for existance of Pi-hole binaries during validation.
- Less chatty about each step of configuration validation if it completes.
- Less chatty about replication validation if it's not necessary.
- Less chatty about file validation if no changes are required.
- When applying `update` in DEV mode, the Git branch used will be shown.
#### 1.7.6

70
gravity-sync.sh
View File

@ -158,44 +158,47 @@ function pull_gs {
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}"
MESSAGE="Validating Settings of ${GRAVITY_FI}"
echo_stat
GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk '{print $3 $4}')
if [ $GRAVDB_OWN == "piholepihole" ]
if [ $GRAVDB_OWN != "piholepihole" ]
then
echo_good
else
MESSAGE="Validating Ownership on ${GRAVITY_FI}"
echo_fail
MESSAGE="Attempting to Compensate"
echo_info
echo_warn
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
echo_stat
sudo chown pihole:pihole ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate
MESSAGE="Continuing Validation of ${GRAVITY_FI}"
echo_stat
fi
MESSAGE="Validating Permissions on ${GRAVITY_FI}"
echo_stat
GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep -v f: | grep ${GRAVITY_FI} | awk '{print $1}')
if [ $GRAVDB_RWE = "-rw-rw-r--" ]
if [ $GRAVDB_RWE != "-rw-rw-r--" ]
then
echo_good
else
MESSAGE="Validating Permissions on ${GRAVITY_FI}"
echo_fail
MESSAGE="Attempting to Compensate"
echo_info
echo_warn
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
MESSAGE="Setting Permissions on ${GRAVITY_FI}"
echo_stat
sudo chmod 664 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate
MESSAGE="Continuing Validation of ${GRAVITY_FI}"
echo_stat
fi
echo_good
if [ "$SKIP_CUSTOM" != '1' ]
then
if [ "$REMOTE_CUSTOM_DNS" == "1" ]
@ -218,43 +221,46 @@ function pull_gs {
sudo cp $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${CUSTOM_DNS}.pull ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
error_validate
MESSAGE="Validating Ownership on ${CUSTOM_DNS}"
MESSAGE="Validating Settings on ${CUSTOM_DNS}"
echo_stat
CUSTOMLS_OWN=$(ls -ld ${PIHOLE_DIR}/${CUSTOM_DNS} | awk '{print $3 $4}')
if [ $CUSTOMLS_OWN == "rootroot" ]
if [ $CUSTOMLS_OWN != "rootroot" ]
then
echo_good
else
MESSAGE="Validating Ownership on ${CUSTOM_DNS}"
echo_fail
MESSAGE="Attempting to Compensate"
echo_info
echo_warn
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
echo_stat
sudo chown root:root ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
error_validate
MESSAGE="Continuing Validation of ${GRAVITY_FI}"
echo_stat
fi
MESSAGE="Validating Permissions on ${CUSTOM_DNS}"
echo_stat
CUSTOMLS_RWE=$(namei -m ${PIHOLE_DIR}/${CUSTOM_DNS} | grep -v f: | grep ${CUSTOM_DNS} | awk '{print $1}')
if [ $CUSTOMLS_RWE == "-rw-r--r--" ]
if [ $CUSTOMLS_RWE != "-rw-r--r--" ]
then
echo_good
else
MESSAGE="Validating Permissions on ${CUSTOM_DNS}"
echo_fail
MESSAGE="Attempting to Compensate"
echo_info
echo_warn
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
echo_stat
sudo chmod 644 ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
error_validate
MESSAGE="Continuing Validation of ${GRAVITY_FI}"
echo_stat
fi
echo_good
fi
fi
@ -369,7 +375,7 @@ function restore_gs {
echo_fail
MESSAGE="Attempting to Compensate"
echo_info
echo_warn
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
echo_stat
@ -388,7 +394,7 @@ function restore_gs {
echo_fail
MESSAGE="Attempting to Compensate"
echo_info
echo_warn
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
echo_stat
@ -416,7 +422,7 @@ function restore_gs {
echo_fail
MESSAGE="Attempting to Compensate"
echo_info
echo_warn
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
echo_stat
@ -435,7 +441,7 @@ function restore_gs {
echo_fail
MESSAGE="Attempting to Compensate"
echo_info
echo_warn
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
echo_stat
@ -631,7 +637,7 @@ function detect_sshkeygen {
MESSAGE="SSH-KEYGEN is Required"
echo_info
MESSAGE="Attempting to Compensate"
echo_info
echo_warn
if hash dropbearkey >/dev/null 2>&1
then
@ -698,7 +704,7 @@ function detect_ssh {
echo_fail
MESSAGE="Attempting to Compensate"
echo_info
echo_warn
MESSAGE="Installing SSH Client with ${PKG_MANAGER}"
echo_stat
@ -720,7 +726,7 @@ function detect_ssh {
distro_check
MESSAGE="Attempting to Compensate"
echo_info
echo_warn
MESSAGE="Installing RSYNC with ${PKG_MANAGER}"
echo_stat