Cutlery/gravity-sync
1
0
Fork 0
mirror of https://github.com/vmstan/gravity-sync.git synced 2025-05-31 04:04:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup indentions

Browse Source
This commit is contained in:
Michael Stanclift 2020-12-31 02:49:54 +00:00
parent 9313200b94
commit 42118e9b98
20 changed files with 562 additions and 826 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gravity-sync.sh
View File

@ -109,82 +109,82 @@ source ${LOCAL_FOLDR}/includes/gs-exit.sh
case $# in case $# in
0) 0)
start_gs start_gs
task_smart ;; task_smart ;;
1) 1)
case $1 in case $1 in
smart|sync) smart|sync)
start_gs start_gs
task_smart ;; task_smart ;;
pull) pull)
start_gs start_gs
task_pull ;; task_pull ;;
push) push)
start_gs start_gs
task_push ;; task_push ;;
restore) restore)
start_gs start_gs
task_restore ;; task_restore ;;
version) version)
start_gs_noconfig start_gs_noconfig
task_version ;; task_version ;;
update|upgrade) update|upgrade)
start_gs_noconfig start_gs_noconfig
task_update ;; task_update ;;
dev|devmode|development|develop) dev|devmode|development|develop)
start_gs_noconfig start_gs_noconfig
task_devmode ;; task_devmode ;;
logs|log) logs|log)
start_gs start_gs
task_logs ;; task_logs ;;
compare) compare)
start_gs start_gs
task_compare ;; task_compare ;;
cron) cron)
start_gs start_gs
task_cron ;; task_cron ;;
config|configure) config|configure)
start_gs_noconfig start_gs_noconfig
task_configure ;; task_configure ;;
auto|automate) auto|automate)
start_gs start_gs
task_automate ;; task_automate ;;
backup) backup)
start_gs start_gs
task_backup ;; task_backup ;;
purge) purge)
start_gs start_gs
task_purge ;; task_purge ;;
sudo) sudo)
start_gs start_gs
task_sudo ;; task_sudo ;;
info) info)
start_gs start_gs
task_info ;; task_info ;;
*) *)
start_gs start_gs
task_invalid ;; task_invalid ;;
esac esac
;; ;;
2) 2)
case $1 in case $1 in
auto|automate) auto|automate)
start_gs start_gs
task_automate ;; task_automate ;;
esac esac
;; ;;
3) 3)
case $1 in case $1 in
auto|automate) auto|automate)
start_gs start_gs
task_automate $2 $3 ;; task_automate $2 $3 ;;
esac esac
;; ;;
*) *)
start_gs start_gs
task_invalid ;; task_invalid ;;
esac esac
# END OF SCRIPT ############################## # END OF SCRIPT ##############################

26
includes/gs-automate.sh
View File

@ -9,7 +9,7 @@ function task_automate {
TASKTYPE='AUTOMATE' TASKTYPE='AUTOMATE'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
CRON_EXIST='0' CRON_EXIST='0'
CRON_CHECK=$(crontab -l | grep -q "${GS_FILENAME}" && echo '1' || echo '0') CRON_CHECK=$(crontab -l | grep -q "${GS_FILENAME}" && echo '1' || echo '0')
if [ ${CRON_CHECK} == 1 ] if [ ${CRON_CHECK} == 1 ]
@ -21,7 +21,7 @@ function task_automate {
MESSAGE="Configuring Hourly Smart Sync" MESSAGE="Configuring Hourly Smart Sync"
echo_info echo_info
if [[ $1 =~ ^[0-9][0-9]?$ ]] if [[ $1 =~ ^[0-9][0-9]?$ ]]
then then
INPUT_AUTO_FREQ=$1 INPUT_AUTO_FREQ=$1
@ -30,7 +30,7 @@ function task_automate {
echo_need echo_need
read INPUT_AUTO_FREQ read INPUT_AUTO_FREQ
fi fi
if [ $INPUT_AUTO_FREQ -gt 30 ] if [ $INPUT_AUTO_FREQ -gt 30 ]
then then
MESSAGE="Invalid Frequency Range" MESSAGE="Invalid Frequency Range"
@ -41,7 +41,7 @@ function task_automate {
if [ $CRON_EXIST == 1 ] if [ $CRON_EXIST == 1 ]
then then
clear_cron clear_cron
MESSAGE="Sync Automation Disabled" MESSAGE="Sync Automation Disabled"
echo_warn echo_warn
else else
@ -53,16 +53,16 @@ function task_automate {
then then
clear_cron clear_cron
fi fi
MESSAGE="Saving New Sync Automation" MESSAGE="Saving New Sync Automation"
echo_stat echo_stat
(crontab -l 2>/dev/null; echo "*/${INPUT_AUTO_FREQ} * * * * ${BASH_PATH} ${LOCAL_FOLDR}/${GS_FILENAME} smart > ${LOG_PATH}/${CRONJOB_LOG}") | crontab - (crontab -l 2>/dev/null; echo "*/${INPUT_AUTO_FREQ} * * * * ${BASH_PATH} ${LOCAL_FOLDR}/${GS_FILENAME} smart > ${LOG_PATH}/${CRONJOB_LOG}") | crontab -
error_validate error_validate
fi fi
MESSAGE="Configuring Daily Backup Frequency" MESSAGE="Configuring Daily Backup Frequency"
echo_info echo_info
if [[ $2 =~ ^[0-9][0-9]?$ ]] if [[ $2 =~ ^[0-9][0-9]?$ ]]
then then
INPUT_AUTO_BACKUP=$2 INPUT_AUTO_BACKUP=$2
@ -71,7 +71,7 @@ function task_automate {
echo_need echo_need
read INPUT_AUTO_BACKUP read INPUT_AUTO_BACKUP
fi fi
if [ $INPUT_AUTO_BACKUP -gt 24 ] if [ $INPUT_AUTO_BACKUP -gt 24 ]
then then
MESSAGE="Invalid Frequency Range" MESSAGE="Invalid Frequency Range"
@ -85,9 +85,9 @@ function task_automate {
MESSAGE="Saving New Backup Automation" MESSAGE="Saving New Backup Automation"
echo_stat echo_stat
(crontab -l 2>/dev/null; echo "0 ${INPUT_AUTO_BACKUP} * * * ${BASH_PATH} ${LOCAL_FOLDR}/${GS_FILENAME} backup >/dev/null 2>&1") | crontab - (crontab -l 2>/dev/null; echo "0 ${INPUT_AUTO_BACKUP} * * * ${BASH_PATH} ${LOCAL_FOLDR}/${GS_FILENAME} backup >/dev/null 2>&1") | crontab -
error_validate error_validate
fi fi
exit_withchange exit_withchange
} }
@ -95,11 +95,11 @@ function task_automate {
function clear_cron { function clear_cron {
MESSAGE="Removing Existing Automation" MESSAGE="Removing Existing Automation"
echo_stat echo_stat
crontab -l > cronjob-old.tmp crontab -l > cronjob-old.tmp
sed "/${GS_FILENAME}/d" cronjob-old.tmp > cronjob-new.tmp sed "/${GS_FILENAME}/d" cronjob-old.tmp > cronjob-new.tmp
crontab cronjob-new.tmp 2>/dev/null crontab cronjob-new.tmp 2>/dev/null
error_validate error_validate
rm cronjob-old.tmp rm cronjob-old.tmp
rm cronjob-new.tmp rm cronjob-new.tmp
} }

30
includes/gs-backup.sh
View File

@ -9,7 +9,7 @@ function task_backup {
TASKTYPE='BACKUP' TASKTYPE='BACKUP'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
backup_settime backup_settime
backup_local_gravity backup_local_gravity
backup_local_custom backup_local_custom
@ -28,17 +28,17 @@ function backup_local_gravity {
echo_stat echo_stat
sqlite3 ${PIHOLE_DIR}/${GRAVITY_FI} ".backup '${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${GRAVITY_FI}.backup'" sqlite3 ${PIHOLE_DIR}/${GRAVITY_FI} ".backup '${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${GRAVITY_FI}.backup'"
error_validate error_validate
} }
function backup_local_custom { function backup_local_custom {
if [ "$SKIP_CUSTOM" != '1' ] if [ "$SKIP_CUSTOM" != '1' ]
then then
if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ] if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ]
then then
MESSAGE="Performing Backup Up Local ${CUSTOM_DNS}" MESSAGE="Performing Backup Up Local ${CUSTOM_DNS}"
echo_stat echo_stat
cp ${PIHOLE_DIR}/${CUSTOM_DNS} ${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${CUSTOM_DNS}.backup cp ${PIHOLE_DIR}/${CUSTOM_DNS} ${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${CUSTOM_DNS}.backup
error_validate error_validate
fi fi
@ -51,25 +51,25 @@ function backup_remote_gravity {
CMD_TIMEOUT='60' CMD_TIMEOUT='60'
CMD_REQUESTED="sudo sqlite3 ${RIHOLE_DIR}/${GRAVITY_FI} \".backup '${RIHOLE_DIR}/${GRAVITY_FI}.backup'\"" CMD_REQUESTED="sudo sqlite3 ${RIHOLE_DIR}/${GRAVITY_FI} \".backup '${RIHOLE_DIR}/${GRAVITY_FI}.backup'\""
create_sshcmd create_sshcmd
} }
function backup_remote_custom { function backup_remote_custom {
if [ "$SKIP_CUSTOM" != '1' ] if [ "$SKIP_CUSTOM" != '1' ]
then then
MESSAGE="Performing Backup of Remote ${CUSTOM_DNS}" MESSAGE="Performing Backup of Remote ${CUSTOM_DNS}"
echo_stat echo_stat
CMD_TIMEOUT='15' CMD_TIMEOUT='15'
CMD_REQUESTED="sudo cp ${RIHOLE_DIR}/${CUSTOM_DNS} ${RIHOLE_DIR}/${CUSTOM_DNS}.backup" CMD_REQUESTED="sudo cp ${RIHOLE_DIR}/${CUSTOM_DNS} ${RIHOLE_DIR}/${CUSTOM_DNS}.backup"
create_sshcmd create_sshcmd
fi fi
} }
function backup_cleanup { function backup_cleanup {
MESSAGE="Cleaning Up Old Backups" MESSAGE="Cleaning Up Old Backups"
echo_stat echo_stat
find ${LOCAL_FOLDR}/${BACKUP_FOLD}/$(date +%Y)*.backup -mtime +${BACKUP_RETAIN} -type f -delete find ${LOCAL_FOLDR}/${BACKUP_FOLD}/$(date +%Y)*.backup -mtime +${BACKUP_RETAIN} -type f -delete
error_validate error_validate
} }

2
includes/gs-colors.sh
View File

@ -36,7 +36,7 @@ function echo_warn {
### Executing ### Executing
function echo_stat { function echo_stat {
echo -en "${STAT} ${MESSAGE}" echo -en "${STAT} ${MESSAGE}"
} }
### Success ### Success
function echo_good { function echo_good {

2
includes/gs-compare.sh
View File

@ -3,7 +3,7 @@ function task_compare {
TASKTYPE='COMPARE' TASKTYPE='COMPARE'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
show_target show_target
validate_gs_folders validate_gs_folders
validate_ph_folders validate_ph_folders

280
includes/gs-config.sh
View File

@ -1,276 +1,12 @@
# GRAVITY SYNC BY VMSTAN ##################### error_validate
# gs-config.sh ###############################
# For documentation or downloading updates visit https://github.com/vmstan/gravity-sync
# This code is called from the main gravity-sync.sh file and should not execute directly!
## Configure Task
function task_configure {
TASKTYPE='CONFIGURE'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good
if [ -f ${LOCAL_FOLDR}/${CONFIG_FILE} ]
then
config_delete
else
config_generate
fi
# backup_settime
# backup_local_gravity
# backup_local_custom
# backup_cleanup
create_alias
exit_withchange
}
## Generate New Configuration
function config_generate {
# detect_ssh
MESSAGE="Creating New ${CONFIG_FILE} from Template"
echo_stat
cp ${LOCAL_FOLDR}/${CONFIG_FILE}.example ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
docker_detect
if [ "${DOCKERREADY}" == "1" ]
then
MESSAGE="Advanced Configuration Required"
echo_info
advanced_config_generate
else
MESSAGE="Use Advanced Installation Options? (Leave blank for default 'No')"
echo_need
read INPUT_ADVANCED_INSTALL
INPUT_ADVANCED_INSTALL="${INPUT_ADVANCED_INSTALL:-N}"
if [ "${INPUT_ADVANCED_INSTALL}" != "N" ]
then
MESSAGE="Advanced Configuration Selected"
echo_info
advanced_config_generate
fi
fi
MESSAGE="Standard Settings"
echo_info
MESSAGE="Primary Pi-hole Address (IP or DNS)"
echo_need
read INPUT_REMOTE_HOST
if [ "${PING_AVOID}" != "1" ]
then
MESSAGE="Testing Network Connection (ICMP)"
echo_stat
ping -c 3 ${INPUT_REMOTE_HOST} >/dev/null 2>&1
error_validate
else
MESSAGE="Bypassing Network Testing (ICMP)"
echo_warn
fi
MESSAGE="SSH User for ${INPUT_REMOTE_HOST}"
echo_need
read INPUT_REMOTE_USER
MESSAGE="Saving Host to ${CONFIG_FILE}"
echo_stat
sed -i "/REMOTE_HOST='192.168.1.10'/c\REMOTE_HOST='${INPUT_REMOTE_HOST}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
MESSAGE="Saving User to ${CONFIG_FILE}"
echo_stat
sed -i "/REMOTE_USER='pi'/c\REMOTE_USER='${INPUT_REMOTE_USER}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
generate_sshkey
MESSAGE="Importing New ${CONFIG_FILE}"
echo_stat
source ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
export_sshkey
# MESSAGE="Testing Configuration"
# echo_info
# validate_os_sshpass
# validate_sqlite3
# detect_remotersync
}
## Advanced Configuration Options
function advanced_config_generate {
MESSAGE="Local Pi-hole in Docker Container? (Leave blank for default 'No')"
echo_need
read INPUT_PH_IN_TYPE
INPUT_PH_IN_TYPE="${INPUT_PH_IN_TYPE:-N}"
if [ "${INPUT_PH_IN_TYPE}" != "N" ]
then
MESSAGE="Saving Local Docker Setting to ${CONFIG_FILE}"
echo_stat
sed -i "/# PH_IN_TYPE=''/c\PH_IN_TYPE='docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
MESSAGE="Local Docker Container Name? (Leave blank for default 'pihole')"
echo_need
read INPUT_DOCKER_CON
INPUT_DOCKER_CON="${INPUT_DOCKER_CON:-pihole}"
if [ "${INPUT_DOCKER_CON}" != "pihole" ]
then
MESSAGE="Saving Local Container Name to ${CONFIG_FILE}"
echo_stat
sed -i "/# DOCKER_CON=''/c\DOCKER_CON='${INPUT_DOCKER_CON}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
fi
MESSAGE="Local Pi-hole 'etc' Volume Path? (Required, no trailing slash)"
echo_need
read INPUT_PIHOLE_DIR
if [ "${INPUT_PIHOLE_DIR}" != "" ]
then
MESSAGE="Saving Local Pi-hole Volume to ${CONFIG_FILE}"
echo_stat
sed -i "/# PIHOLE_DIR=''/c\PIHOLE_DIR='${INPUT_PIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
SKIP_PIHOLE_DIR="1"
else
MESSAGE="This setting is required!"
echo_warn
exit_withchanges
fi
MESSAGE="Saving Local Volume Ownership to ${CONFIG_FILE}"
echo_stat
sed -i "/# FILE_OWNER=''/c\FILE_OWNER='named:docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
fi
MESSAGE="Remote Pi-hole in Docker Container? (Leave blank for default 'No')"
echo_need
read INPUT_RH_IN_TYPE
INPUT_RH_IN_TYPE="${INPUT_RH_IN_TYPE:-N}"
if [ "${INPUT_RH_IN_TYPE}" != "N" ]
then
MESSAGE="Saving Remote Docker Setting to ${CONFIG_FILE}"
echo_stat
sed -i "/# RH_IN_TYPE=''/c\RH_IN_TYPE='docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
MESSAGE="Remote Docker Container Name? (Leave blank for default 'pihole')"
echo_need
read INPUT_ROCKER_CON
INPUT_ROCKER_CON="${INPUT_ROCKER_CON:-pihole}"
if [ "${INPUT_ROCKER_CON}" != "pihole" ]
then
MESSAGE="Saving Remote Container Name to ${CONFIG_FILE}"
echo_stat
sed -i "/# ROCKER_CON=''/c\ROCKER_CON='${INPUT_ROCKER_CON}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
fi
MESSAGE="Remote Pi-hole 'etc' Volume Path? (Required, no trailing slash)"
echo_need
read INPUT_RIHOLE_DIR
if [ "${INPUT_RIHOLE_DIR}" != "" ]
then
MESSAGE="Saving Remote Pi-hole Volume to ${CONFIG_FILE}"
echo_stat
sed -i "/# RIHOLE_DIR=''/c\RIHOLE_DIR='${INPUT_RIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
SKIP_RIHOLE_DIR="1"
else
MESSAGE="This setting is required!"
echo_warn
exit_withchanges
fi
MESSAGE="Saving Remote Volume Ownership to ${CONFIG_FILE}"
echo_stat
sed -i "/# RILE_OWNER=''/c\RILE_OWNER='named:docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
fi
if [ $SKIP_PIHOLE_DIR != "1" ]
then
MESSAGE="Local Pi-hole Settings Directory Path? (Leave blank for default '/etc/pihole')"
echo_need
read INPUT_PIHOLE_DIR
INPUT_PIHOLE_DIR="${INPUT_PIHOLE_DIR:-/etc/pihole}"
if [ "${INPUT_PIHOLE_DIR}" != "/etc/pihole" ]
then
MESSAGE="Saving Local Pi-hole Settings Directory Path to ${CONFIG_FILE}"
echo_stat
sed -i "/# PIHOLE_DIR=''/c\PIHOLE_DIR='${INPUT_PIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
fi
fi
if [ "$SKIP_RIHOLE_DIR" != "1" ]
then
MESSAGE="Remote Pi-hole Settings Directory Path? (Leave blank for default '/etc/pihole')"
echo_need
read INPUT_RIHOLE_DIR
INPUT_RIHOLE_DIR="${INPUT_RIHOLE_DIR:-/etc/pihole}"
if [ "${INPUT_RIHOLE_DIR}" != "/etc/pihole" ]
then
MESSAGE="Saving Remote Pi-hole Settings Directory Path to ${CONFIG_FILE}"
echo_stat
sed -i "/# RIHOLE_DIR=''/c\RIHOLE_DIR='${INPUT_RIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
fi
fi
MESSAGE="Use Custom SSH Port? (Leave blank for default '22')"
echo_need
read INPUT_SSH_PORT
INPUT_SSH_PORT="${INPUT_SSH_PORT:-22}"
SSH_PORT="${INPUT_SSH_PORT}"
if [ "${INPUT_SSH_PORT}" != "22" ]
then
MESSAGE="Saving Custom SSH Port to ${CONFIG_FILE}"
echo_stat
sed -i "/# SSH_PORT=''/c\SSH_PORT='${INPUT_SSH_PORT}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
fi
MESSAGE="Enable ICMP Check? (Leave blank for default 'Yes')"
echo_need
read INPUT_PING_AVOID
INPUT_PING_AVOID="${INPUT_PING_AVOID:-Y}"
if [ "${INPUT_PING_AVOID}" != "Y" ]
then
MESSAGE="Saving ICMP Avoidance to ${CONFIG_FILE}"
echo_stat
sed -i "/# PING_AVOID=''/c\PING_AVOID='1'" ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate
PING_AVOID=1 PING_AVOID=1
fi fi
MESSAGE="Use Custom SSH PKIF Location? (Leave blank for default '.ssh/id_rsa')" MESSAGE="Use Custom SSH PKIF Location? (Leave blank for default '.ssh/id_rsa')"
echo_need echo_need
read INPUT_CUSTOM_PKIF read INPUT_CUSTOM_PKIF
INPUT_CUSTOM_PKIF="${INPUT_CUSTOM_PKIF:-.ssh/id_rsa}" INPUT_CUSTOM_PKIF="${INPUT_CUSTOM_PKIF:-.ssh/id_rsa}"
if [ "${INPUT_CUSTOM_PKIF}" != ".ssh/id_rsa" ] if [ "${INPUT_CUSTOM_PKIF}" != ".ssh/id_rsa" ]
then then
MESSAGE="Saving Custom PKIF to ${CONFIG_FILE}" MESSAGE="Saving Custom PKIF to ${CONFIG_FILE}"
@ -318,14 +54,14 @@ function config_delete {
MESSAGE="Are you sure you want to erase this configuration?" MESSAGE="Are you sure you want to erase this configuration?"
echo_warn echo_warn
intent_validate intent_validate
MESSAGE="Erasing Existing Configuration" MESSAGE="Erasing Existing Configuration"
echo_stat echo_stat
rm -f ${LOCAL_FOLDR}/${CONFIG_FILE} rm -f ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate error_validate
config_generate config_generate
} }
@ -347,5 +83,5 @@ function create_alias {
echo_stat echo_stat
echo -e "alias gravity-sync='${GS_FILEPATH}'" | sudo tee -a /etc/bash.bashrc > /dev/null echo -e "alias gravity-sync='${GS_FILEPATH}'" | sudo tee -a /etc/bash.bashrc > /dev/null
error_validate error_validate
} }

14
includes/gs-core.sh
View File

@ -11,18 +11,18 @@ function import_gs {
if [ -f ${LOCAL_FOLDR}/${CONFIG_FILE} ] if [ -f ${LOCAL_FOLDR}/${CONFIG_FILE} ]
then then
source ${LOCAL_FOLDR}/${CONFIG_FILE} source ${LOCAL_FOLDR}/${CONFIG_FILE}
error_validate error_validate
# MESSAGE="Targeting ${REMOTE_USER}@${REMOTE_HOST}" # MESSAGE="Targeting ${REMOTE_USER}@${REMOTE_HOST}"
# echo_info # echo_info
# detect_ssh # detect_ssh
else else
echo_fail echo_fail
MESSAGE="${CONFIG_FILE} Missing" MESSAGE="${CONFIG_FILE} Missing"
echo_info echo_info
TASKTYPE='CONFIG' TASKTYPE='CONFIG'
config_generate config_generate
fi fi
@ -71,10 +71,10 @@ function start_gs {
import_gs import_gs
ph_type ph_type
MESSAGE="Evaluating Arguments" MESSAGE="Evaluating Arguments"
echo_stat echo_stat
if [ "${ROOT_CHECK_AVOID}" != "1" ] if [ "${ROOT_CHECK_AVOID}" != "1" ]
then then
new_root_check new_root_check
@ -86,7 +86,7 @@ function start_gs_noconfig {
MESSAGE="${PROGRAM} ${VERSION} Executing" MESSAGE="${PROGRAM} ${VERSION} Executing"
echo_info echo_info
cd ${LOCAL_FOLDR} cd ${LOCAL_FOLDR}
MESSAGE="Evaluating Arguments" MESSAGE="Evaluating Arguments"
echo_stat echo_stat
} }

44
includes/gs-hashing.sh
View File

@ -7,16 +7,16 @@
## Validate Sync Required ## Validate Sync Required
function md5_compare { function md5_compare {
HASHMARK='0' HASHMARK='0'
MESSAGE="Analyzing ${GRAVITY_FI} on ${REMOTE_HOST}" MESSAGE="Analyzing ${GRAVITY_FI} on ${REMOTE_HOST}"
echo_stat echo_stat
primaryDBMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${RIHOLE_DIR}/${GRAVITY_FI}" | sed 's/\s.*$//') primaryDBMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${RIHOLE_DIR}/${GRAVITY_FI}" | sed 's/\s.*$//')
error_validate error_validate
MESSAGE="Analyzing ${GRAVITY_FI} on $HOSTNAME" MESSAGE="Analyzing ${GRAVITY_FI} on $HOSTNAME"
echo_stat echo_stat
secondDBMD5=$(md5sum ${PIHOLE_DIR}/${GRAVITY_FI} | sed 's/\s.*$//') secondDBMD5=$(md5sum ${PIHOLE_DIR}/${GRAVITY_FI} | sed 's/\s.*$//')
error_validate error_validate
if [ "$primaryDBMD5" == "$last_primaryDBMD5" ] && [ "$secondDBMD5" == "$last_secondDBMD5" ] if [ "$primaryDBMD5" == "$last_primaryDBMD5" ] && [ "$secondDBMD5" == "$last_secondDBMD5" ]
then then
@ -26,7 +26,7 @@ function md5_compare {
echo_warn echo_warn
HASHMARK=$((HASHMARK+1)) HASHMARK=$((HASHMARK+1))
fi fi
if [ "$SKIP_CUSTOM" != '1' ] if [ "$SKIP_CUSTOM" != '1' ]
then then
if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ] if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ]
@ -36,14 +36,14 @@ function md5_compare {
REMOTE_CUSTOM_DNS="1" REMOTE_CUSTOM_DNS="1"
MESSAGE="Analyzing ${CUSTOM_DNS} on ${REMOTE_HOST}" MESSAGE="Analyzing ${CUSTOM_DNS} on ${REMOTE_HOST}"
echo_stat echo_stat
primaryCLMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${RIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//'") primaryCLMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${RIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//'")
error_validate error_validate
MESSAGE="Analyzing ${CUSTOM_DNS} on $HOSTNAME" MESSAGE="Analyzing ${CUSTOM_DNS} on $HOSTNAME"
echo_stat echo_stat
secondCLMD5=$(md5sum ${PIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//') secondCLMD5=$(md5sum ${PIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//')
error_validate error_validate
if [ "$primaryCLMD5" == "$last_primaryCLMD5" ] && [ "$secondCLMD5" == "$last_secondCLMD5" ] if [ "$primaryCLMD5" == "$last_primaryCLMD5" ] && [ "$secondCLMD5" == "$last_secondCLMD5" ]
then then
@ -64,12 +64,12 @@ function md5_compare {
MESSAGE="${REMOTE_HOST} has ${CUSTOM_DNS}" MESSAGE="${REMOTE_HOST} has ${CUSTOM_DNS}"
HASHMARK=$((HASHMARK+1)) HASHMARK=$((HASHMARK+1))
echo_info echo_info
fi fi
MESSAGE="No ${CUSTOM_DNS} Detected on $HOSTNAME" MESSAGE="No ${CUSTOM_DNS} Detected on $HOSTNAME"
echo_info echo_info
fi fi
fi fi
if [ "$HASHMARK" != "0" ] if [ "$HASHMARK" != "0" ]
then then
MESSAGE="Replication Required" MESSAGE="Replication Required"
@ -78,7 +78,7 @@ function md5_compare {
else else
MESSAGE="No Replication Required" MESSAGE="No Replication Required"
echo_info echo_info
exit_nochange exit_nochange
fi fi
} }
@ -102,17 +102,17 @@ function md5_recheck {
echo_info echo_info
HASHMARK='0' HASHMARK='0'
MESSAGE="Reanalyzing ${GRAVITY_FI} on ${REMOTE_HOST}" MESSAGE="Reanalyzing ${GRAVITY_FI} on ${REMOTE_HOST}"
echo_stat echo_stat
primaryDBMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${RIHOLE_DIR}/${GRAVITY_FI}" | sed 's/\s.*$//') primaryDBMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${RIHOLE_DIR}/${GRAVITY_FI}" | sed 's/\s.*$//')
error_validate error_validate
MESSAGE="Reanalyzing ${GRAVITY_FI} on $HOSTNAME" MESSAGE="Reanalyzing ${GRAVITY_FI} on $HOSTNAME"
echo_stat echo_stat
secondDBMD5=$(md5sum ${PIHOLE_DIR}/${GRAVITY_FI} | sed 's/\s.*$//') secondDBMD5=$(md5sum ${PIHOLE_DIR}/${GRAVITY_FI} | sed 's/\s.*$//')
error_validate error_validate
if [ "$SKIP_CUSTOM" != '1' ] if [ "$SKIP_CUSTOM" != '1' ]
then then
if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ] if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ]
@ -122,14 +122,14 @@ function md5_recheck {
REMOTE_CUSTOM_DNS="1" REMOTE_CUSTOM_DNS="1"
MESSAGE="Reanalyzing ${CUSTOM_DNS} on ${REMOTE_HOST}" MESSAGE="Reanalyzing ${CUSTOM_DNS} on ${REMOTE_HOST}"
echo_stat echo_stat
primaryCLMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${RIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//'") primaryCLMD5=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "md5sum ${RIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//'")
error_validate error_validate
MESSAGE="Reanalyzing ${CUSTOM_DNS} on $HOSTNAME" MESSAGE="Reanalyzing ${CUSTOM_DNS} on $HOSTNAME"
echo_stat echo_stat
secondCLMD5=$(md5sum ${PIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//') secondCLMD5=$(md5sum ${PIHOLE_DIR}/${CUSTOM_DNS} | sed 's/\s.*$//')
error_validate error_validate
else else
MESSAGE="No ${CUSTOM_DNS} Detected on ${REMOTE_HOST}" MESSAGE="No ${CUSTOM_DNS} Detected on ${REMOTE_HOST}"
echo_info echo_info
@ -140,7 +140,7 @@ function md5_recheck {
REMOTE_CUSTOM_DNS="1" REMOTE_CUSTOM_DNS="1"
MESSAGE="${REMOTE_HOST} has ${CUSTOM_DNS}" MESSAGE="${REMOTE_HOST} has ${CUSTOM_DNS}"
echo_info echo_info
fi fi
MESSAGE="No ${CUSTOM_DNS} Detected on $HOSTNAME" MESSAGE="No ${CUSTOM_DNS} Detected on $HOSTNAME"
echo_info echo_info
fi fi

4
includes/gs-intent.sh
View File

@ -25,9 +25,9 @@ function intent_validate {
MESSAGE="Type ${INTENT} to Confirm" MESSAGE="Type ${INTENT} to Confirm"
echo_need echo_need
read INPUT_INTENT read INPUT_INTENT
if [ "${INPUT_INTENT}" != "${INTENT}" ] if [ "${INPUT_INTENT}" != "${INTENT}" ]
then then
MESSAGE="${TASKTYPE} Aborted" MESSAGE="${TASKTYPE} Aborted"

58
includes/gs-logging.sh
View File

@ -9,7 +9,7 @@ function task_logs {
TASKTYPE='LOGS' TASKTYPE='LOGS'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
logs_gs logs_gs
} }
@ -18,40 +18,40 @@ function task_logs {
function logs_export { function logs_export {
if [ "${TASKTYPE}" != "BACKUP" ] if [ "${TASKTYPE}" != "BACKUP" ]
then then
MESSAGE="Saving File Hashes" MESSAGE="Saving File Hashes"
echo_stat echo_stat
rm -f ${LOG_PATH}/${HISTORY_MD5} rm -f ${LOG_PATH}/${HISTORY_MD5}
echo -e ${primaryDBMD5} >> ${LOG_PATH}/${HISTORY_MD5} echo -e ${primaryDBMD5} >> ${LOG_PATH}/${HISTORY_MD5}
echo -e ${secondDBMD5} >> ${LOG_PATH}/${HISTORY_MD5} echo -e ${secondDBMD5} >> ${LOG_PATH}/${HISTORY_MD5}
echo -e ${primaryCLMD5} >> ${LOG_PATH}/${HISTORY_MD5} echo -e ${primaryCLMD5} >> ${LOG_PATH}/${HISTORY_MD5}
echo -e ${secondCLMD5} >> ${LOG_PATH}/${HISTORY_MD5} echo -e ${secondCLMD5} >> ${LOG_PATH}/${HISTORY_MD5}
error_validate error_validate
fi fi
MESSAGE="Logging Successful ${TASKTYPE}" MESSAGE="Logging Successful ${TASKTYPE}"
echo_stat echo_stat
echo -e $(date) "[${TASKTYPE}]" >> ${LOG_PATH}/${SYNCING_LOG} echo -e $(date) "[${TASKTYPE}]" >> ${LOG_PATH}/${SYNCING_LOG}
error_validate error_validate
} }
### Output Sync Logs ### Output Sync Logs
function logs_gs { function logs_gs {
MESSAGE="Tailing ${LOG_PATH}/${SYNCING_LOG}" MESSAGE="Tailing ${LOG_PATH}/${SYNCING_LOG}"
echo_info echo_info
echo -e "========================================================" echo -e "========================================================"
echo -e "Recent Complete ${YELLOW}SMART${NC} Executions" echo -e "Recent Complete ${YELLOW}SMART${NC} Executions"
tail -n 7 "${LOG_PATH}/${SYNCING_LOG}" | grep SMART tail -n 7 "${LOG_PATH}/${SYNCING_LOG}" | grep SMART
echo -e "Recent Complete ${YELLOW}PULL${NC} Executions" echo -e "Recent Complete ${YELLOW}PULL${NC} Executions"
tail -n 7 "${LOG_PATH}/${SYNCING_LOG}" | grep PULL tail -n 7 "${LOG_PATH}/${SYNCING_LOG}" | grep PULL
echo -e "Recent Complete ${YELLOW}PUSH${NC} Executions" echo -e "Recent Complete ${YELLOW}PUSH${NC} Executions"
tail -n 7 "${LOG_PATH}/${SYNCING_LOG}" | grep PUSH tail -n 7 "${LOG_PATH}/${SYNCING_LOG}" | grep PUSH
echo -e "Recent Complete ${YELLOW}BACKUP${NC} Executions" echo -e "Recent Complete ${YELLOW}BACKUP${NC} Executions"
tail -n 7 "${LOG_PATH}/${SYNCING_LOG}" | grep BACKUP tail -n 7 "${LOG_PATH}/${SYNCING_LOG}" | grep BACKUP
echo -e "Recent Complete ${YELLOW}RESTORE${NC} Executions" echo -e "Recent Complete ${YELLOW}RESTORE${NC} Executions"
tail -n 7 "${LOG_PATH}/${SYNCING_LOG}" | grep RESTORE tail -n 7 "${LOG_PATH}/${SYNCING_LOG}" | grep RESTORE
echo -e "========================================================" echo -e "========================================================"
exit_nochange exit_nochange
} }
@ -64,31 +64,31 @@ function show_crontab {
if [ -f ${LOG_PATH}/${CRONJOB_LOG} ] if [ -f ${LOG_PATH}/${CRONJOB_LOG} ]
then then
if [ -s ${LOG_PATH}/${CRONJOB_LOG} ] if [ -s ${LOG_PATH}/${CRONJOB_LOG} ]
echo_good echo_good
MESSAGE="Tailing ${LOG_PATH}/${CRONJOB_LOG}" MESSAGE="Tailing ${LOG_PATH}/${CRONJOB_LOG}"
echo_info echo_info
echo -e "========================================================" echo -e "========================================================"
date -r ${LOG_PATH}/${CRONJOB_LOG} date -r ${LOG_PATH}/${CRONJOB_LOG}
cat ${LOG_PATH}/${CRONJOB_LOG} cat ${LOG_PATH}/${CRONJOB_LOG}
echo -e "========================================================" echo -e "========================================================"
exit_nochange exit_nochange
then then
echo_fail echo_fail
MESSAGE="${LOG_PATH}/${CRONJOB_LOG} is Empty" MESSAGE="${LOG_PATH}/${CRONJOB_LOG} is Empty"
echo_info echo_info
exit_nochange exit_nochange
fi fi
else else
echo_fail echo_fail
MESSAGE="${LOG_PATH}/${CRONJOB_LOG} is Missing" MESSAGE="${LOG_PATH}/${CRONJOB_LOG} is Missing"
echo_info echo_info
exit_nochange exit_nochange
fi fi
} }

192
includes/gs-pull.sh
View File

@ -9,146 +9,146 @@ function task_pull {
TASKTYPE='PULL' TASKTYPE='PULL'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
show_target show_target
validate_gs_folders validate_gs_folders
validate_ph_folders validate_ph_folders
validate_sqlite3 validate_sqlite3
validate_os_sshpass validate_os_sshpass
pull_gs pull_gs
exit exit
} }
## Pull Gravity ## Pull Gravity
function pull_gs_grav { function pull_gs_grav {
backup_local_gravity backup_local_gravity
backup_remote_gravity backup_remote_gravity
MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}" MESSAGE="Pulling ${GRAVITY_FI} from ${REMOTE_HOST}"
echo_stat echo_stat
RSYNC_REPATH="rsync" RSYNC_REPATH="rsync"
RSYNC_SOURCE="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${GRAVITY_FI}.backup" RSYNC_SOURCE="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${GRAVITY_FI}.backup"
RSYNC_TARGET="${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull" RSYNC_TARGET="${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull"
create_rsynccmd create_rsynccmd
MESSAGE="Replacing ${GRAVITY_FI} on $HOSTNAME" MESSAGE="Replacing ${GRAVITY_FI} on $HOSTNAME"
echo_stat echo_stat
sudo cp ${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 sudo cp ${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.pull ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate error_validate
if [ "$FILE_OWNER" != "named:docker" ] if [ "$FILE_OWNER" != "named:docker" ]
then then
MESSAGE="Validating Settings of ${GRAVITY_FI}" MESSAGE="Validating Settings of ${GRAVITY_FI}"
echo_stat echo_stat
GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk 'OFS=":" {print $3,$4}')
if [ "$GRAVDB_OWN" != "$FILE_OWNER" ]
then
MESSAGE="Validating Ownership on ${GRAVITY_FI}"
echo_fail
MESSAGE="Attempting to Compensate"
echo_warn
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
echo_stat
sudo chown ${FILE_OWNER} ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate
MESSAGE="Continuing Validation of ${GRAVITY_FI}"
echo_stat
fi
else
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
echo_stat
sudo chown ${FILE_OWNER} ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate
fi
GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk 'OFS=":" {print $3,$4}')
GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep -v f: | grep ${GRAVITY_FI} | awk '{print $1}') if [ "$GRAVDB_OWN" != "$FILE_OWNER" ]
if [ "$GRAVDB_RWE" != "-rw-rw-r--" ]
then then
MESSAGE="Validating Permissions on ${GRAVITY_FI}" MESSAGE="Validating Ownership on ${GRAVITY_FI}"
echo_fail echo_fail
MESSAGE="Attempting to Compensate" MESSAGE="Attempting to Compensate"
echo_warn echo_warn
MESSAGE="Setting Permissions on ${GRAVITY_FI}" MESSAGE="Setting Ownership on ${GRAVITY_FI}"
echo_stat echo_stat
sudo chmod 664 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 sudo chown ${FILE_OWNER} ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate error_validate
MESSAGE="Continuing Validation of ${GRAVITY_FI}" MESSAGE="Continuing Validation of ${GRAVITY_FI}"
echo_stat echo_stat
fi fi
else
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
echo_stat
sudo chown ${FILE_OWNER} ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate
fi
GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep -v f: | grep ${GRAVITY_FI} | awk '{print $1}')
if [ "$GRAVDB_RWE" != "-rw-rw-r--" ]
then
MESSAGE="Validating Permissions on ${GRAVITY_FI}"
echo_fail
MESSAGE="Attempting to Compensate"
echo_warn
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 echo_good
} }
## Pull Custom ## Pull Custom
function pull_gs_cust { function pull_gs_cust {
if [ "$SKIP_CUSTOM" != '1' ] if [ "$SKIP_CUSTOM" != '1' ]
then then
if [ "$REMOTE_CUSTOM_DNS" == "1" ] if [ "$REMOTE_CUSTOM_DNS" == "1" ]
then then
backup_local_custom backup_local_custom
backup_remote_custom backup_remote_custom
MESSAGE="Pulling ${CUSTOM_DNS} from ${REMOTE_HOST}" MESSAGE="Pulling ${CUSTOM_DNS} from ${REMOTE_HOST}"
echo_stat echo_stat
RSYNC_REPATH="rsync" RSYNC_REPATH="rsync"
RSYNC_SOURCE="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${CUSTOM_DNS}.backup" RSYNC_SOURCE="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${CUSTOM_DNS}.backup"
RSYNC_TARGET="${LOCAL_FOLDR}/${BACKUP_FOLD}/${CUSTOM_DNS}.pull" RSYNC_TARGET="${LOCAL_FOLDR}/${BACKUP_FOLD}/${CUSTOM_DNS}.pull"
create_rsynccmd create_rsynccmd
MESSAGE="Replacing ${CUSTOM_DNS} on $HOSTNAME" MESSAGE="Replacing ${CUSTOM_DNS} on $HOSTNAME"
echo_stat echo_stat
sudo cp ${LOCAL_FOLDR}/${BACKUP_FOLD}/${CUSTOM_DNS}.pull ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1 sudo cp ${LOCAL_FOLDR}/${BACKUP_FOLD}/${CUSTOM_DNS}.pull ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
error_validate error_validate
MESSAGE="Validating Settings on ${CUSTOM_DNS}" MESSAGE="Validating Settings on ${CUSTOM_DNS}"
echo_stat echo_stat
CUSTOMLS_OWN=$(ls -ld ${PIHOLE_DIR}/${CUSTOM_DNS} | awk '{print $3 $4}')
if [ "$CUSTOMLS_OWN" != "rootroot" ]
then
MESSAGE="Validating Ownership on ${CUSTOM_DNS}"
echo_fail
MESSAGE="Attempting to Compensate"
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
CUSTOMLS_RWE=$(namei -m ${PIHOLE_DIR}/${CUSTOM_DNS} | grep -v f: | grep ${CUSTOM_DNS} | awk '{print $1}') CUSTOMLS_OWN=$(ls -ld ${PIHOLE_DIR}/${CUSTOM_DNS} | awk '{print $3 $4}')
if [ "$CUSTOMLS_RWE" != "-rw-r--r--" ] if [ "$CUSTOMLS_OWN" != "rootroot" ]
then then
MESSAGE="Validating Permissions on ${CUSTOM_DNS}" MESSAGE="Validating Ownership on ${CUSTOM_DNS}"
echo_fail echo_fail
MESSAGE="Attempting to Compensate"
echo_warn
MESSAGE="Setting Ownership on ${CUSTOM_DNS}" MESSAGE="Attempting to Compensate"
echo_stat echo_warn
sudo chmod 644 ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
error_validate MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
echo_stat
MESSAGE="Continuing Validation of ${GRAVITY_FI}" sudo chown root:root ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
echo_stat error_validate
fi
MESSAGE="Continuing Validation of ${GRAVITY_FI}"
echo_stat
fi
CUSTOMLS_RWE=$(namei -m ${PIHOLE_DIR}/${CUSTOM_DNS} | grep -v f: | grep ${CUSTOM_DNS} | awk '{print $1}')
if [ "$CUSTOMLS_RWE" != "-rw-r--r--" ]
then
MESSAGE="Validating Permissions on ${CUSTOM_DNS}"
echo_fail
MESSAGE="Attempting to Compensate"
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 echo_good
fi fi
fi fi
@ -158,17 +158,17 @@ function pull_gs_cust {
function pull_gs_reload { function pull_gs_reload {
MESSAGE="Isolating Regeneration Pathways" MESSAGE="Isolating Regeneration Pathways"
echo_info echo_info
sleep 1 sleep 1
MESSAGE="Updating FTLDNS Configuration" MESSAGE="Updating FTLDNS Configuration"
echo_stat echo_stat
${PH_EXEC} restartdns reloadlists >/dev/null 2>&1 ${PH_EXEC} restartdns reloadlists >/dev/null 2>&1
error_validate error_validate
MESSAGE="Reloading FTLDNS Services" MESSAGE="Reloading FTLDNS Services"
echo_stat echo_stat
${PH_EXEC} restartdns >/dev/null 2>&1 ${PH_EXEC} restartdns >/dev/null 2>&1
error_validate error_validate
} }
## Pull Function ## Pull Function

40
includes/gs-purge.sh
View File

@ -9,7 +9,7 @@ function task_purge {
TASKTYPE="THE-PURGE" TASKTYPE="THE-PURGE"
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
MESSAGE="THIS WILL RESET YOUR ENTIRE GRAVITY SYNC INSTALLATION" MESSAGE="THIS WILL RESET YOUR ENTIRE GRAVITY SYNC INSTALLATION"
echo_warn echo_warn
MESSAGE="This will remove:" MESSAGE="This will remove:"
@ -18,7 +18,7 @@ function task_purge {
echo_warn echo_warn
MESSAGE="- Your ${CONFIG_FILE} file." MESSAGE="- Your ${CONFIG_FILE} file."
echo_warn echo_warn
if [ -f "${LOCAL_FOLDR}/dev" ] if [ -f "${LOCAL_FOLDR}/dev" ]
then then
MESSAGE="- Your development branch updater." MESSAGE="- Your development branch updater."
@ -27,7 +27,7 @@ function task_purge {
MESSAGE="- Your beta branch updater." MESSAGE="- Your beta branch updater."
fi fi
echo_warn echo_warn
MESSAGE="- All cronjob/automation tasks." MESSAGE="- All cronjob/automation tasks."
echo_warn echo_warn
MESSAGE="- All job history/logs." MESSAGE="- All job history/logs."
@ -36,10 +36,10 @@ function task_purge {
echo_warn echo_warn
MESSAGE="This function cannot be undone!" MESSAGE="This function cannot be undone!"
echo_warn echo_warn
MESSAGE="YOU WILL NEED TO REBUILD GRAVITY SYNC AFTER EXECUTION" MESSAGE="YOU WILL NEED TO REBUILD GRAVITY SYNC AFTER EXECUTION"
echo_warn echo_warn
MESSAGE="Pi-hole binaries, configuration and services ARE NOT impacted!" MESSAGE="Pi-hole binaries, configuration and services ARE NOT impacted!"
echo_info echo_info
MESSAGE="Your device will continue to resolve and block DNS requests," MESSAGE="Your device will continue to resolve and block DNS requests,"
@ -48,31 +48,31 @@ function task_purge {
echo_info echo_info
MESSAGE="until you reconfigure Gravity Sync on this device." MESSAGE="until you reconfigure Gravity Sync on this device."
echo_info echo_info
intent_validate intent_validate
MESSAGE="Cleaning Gravity Sync Directory" MESSAGE="Cleaning Gravity Sync Directory"
echo_stat echo_stat
git clean -f -X -d >/dev/null 2>&1 git clean -f -X -d >/dev/null 2>&1
error_validate error_validate
clear_cron clear_cron
MESSAGE="Deleting SSH Key-files" MESSAGE="Deleting SSH Key-files"
echo_stat echo_stat
rm -f $HOME/${SSH_PKIF} >/dev/null 2>&1 rm -f $HOME/${SSH_PKIF} >/dev/null 2>&1
rm -f $HOME/${SSH_PKIF}.pub >/dev/null 2>&1 rm -f $HOME/${SSH_PKIF}.pub >/dev/null 2>&1
error_validate error_validate
MESSAGE="Realigning Dilithium Matrix" MESSAGE="Realigning Dilithium Matrix"
echo_stat echo_stat
sleep 1 sleep 1
MESSAGE="Realigning Dilithium Matrix" MESSAGE="Realigning Dilithium Matrix"
echo_good echo_good
update_gs update_gs
} }

98
includes/gs-push.sh
View File

@ -9,13 +9,13 @@ function task_push {
TASKTYPE='PUSH' TASKTYPE='PUSH'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
show_target show_target
validate_gs_folders validate_gs_folders
validate_ph_folders validate_ph_folders
validate_sqlite3 validate_sqlite3
validate_os_sshpass validate_os_sshpass
push_gs push_gs
exit exit
} }
@ -27,66 +27,66 @@ function push_gs_grav {
MESSAGE="Copying ${GRAVITY_FI} from ${REMOTE_HOST}" MESSAGE="Copying ${GRAVITY_FI} from ${REMOTE_HOST}"
echo_stat echo_stat
RSYNC_REPATH="rsync" RSYNC_REPATH="rsync"
RSYNC_SOURCE="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${GRAVITY_FI}.backup" RSYNC_SOURCE="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${GRAVITY_FI}.backup"
RSYNC_TARGET="${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.push" RSYNC_TARGET="${LOCAL_FOLDR}/${BACKUP_FOLD}/${GRAVITY_FI}.push"
create_rsynccmd create_rsynccmd
MESSAGE="Pushing ${GRAVITY_FI} to ${REMOTE_HOST}" MESSAGE="Pushing ${GRAVITY_FI} to ${REMOTE_HOST}"
echo_stat echo_stat
RSYNC_REPATH="sudo rsync" RSYNC_REPATH="sudo rsync"
RSYNC_SOURCE="${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${GRAVITY_FI}.backup" RSYNC_SOURCE="${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${GRAVITY_FI}.backup"
RSYNC_TARGET="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${GRAVITY_FI}" RSYNC_TARGET="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${GRAVITY_FI}"
create_rsynccmd create_rsynccmd
MESSAGE="Setting Permissions on ${GRAVITY_FI}" MESSAGE="Setting Permissions on ${GRAVITY_FI}"
echo_stat echo_stat
CMD_TIMEOUT='15' CMD_TIMEOUT='15'
CMD_REQUESTED="sudo chmod 664 ${RIHOLE_DIR}/${GRAVITY_FI}" CMD_REQUESTED="sudo chmod 664 ${RIHOLE_DIR}/${GRAVITY_FI}"
create_sshcmd create_sshcmd
MESSAGE="Setting Ownership on ${GRAVITY_FI}" MESSAGE="Setting Ownership on ${GRAVITY_FI}"
echo_stat echo_stat
CMD_TIMEOUT='15' CMD_TIMEOUT='15'
CMD_REQUESTED="sudo chown ${RILE_OWNER} ${RIHOLE_DIR}/${GRAVITY_FI}" CMD_REQUESTED="sudo chown ${RILE_OWNER} ${RIHOLE_DIR}/${GRAVITY_FI}"
create_sshcmd create_sshcmd
} }
## Push Custom ## Push Custom
function push_gs_cust { function push_gs_cust {
if [ "$SKIP_CUSTOM" != '1' ] if [ "$SKIP_CUSTOM" != '1' ]
then then
if [ "$REMOTE_CUSTOM_DNS" == "1" ] if [ "$REMOTE_CUSTOM_DNS" == "1" ]
then then
backup_remote_custom backup_remote_custom
backup_local_custom backup_local_custom
MESSAGE="Copying ${CUSTOM_DNS} from ${REMOTE_HOST}" MESSAGE="Copying ${CUSTOM_DNS} from ${REMOTE_HOST}"
echo_stat echo_stat
RSYNC_REPATH="rsync" RSYNC_REPATH="rsync"
RSYNC_SOURCE="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${CUSTOM_DNS}.backup" RSYNC_SOURCE="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${CUSTOM_DNS}.backup"
RSYNC_TARGET="${LOCAL_FOLDR}/${BACKUP_FOLD}/${CUSTOM_DNS}.push" RSYNC_TARGET="${LOCAL_FOLDR}/${BACKUP_FOLD}/${CUSTOM_DNS}.push"
create_rsynccmd create_rsynccmd
MESSAGE="Pushing ${CUSTOM_DNS} to ${REMOTE_HOST}" MESSAGE="Pushing ${CUSTOM_DNS} to ${REMOTE_HOST}"
echo_stat echo_stat
RSYNC_REPATH="sudo rsync" RSYNC_REPATH="sudo rsync"
RSYNC_SOURCE="${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${CUSTOM_DNS}.backup" RSYNC_SOURCE="${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${CUSTOM_DNS}.backup"
RSYNC_TARGET="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${CUSTOM_DNS}" RSYNC_TARGET="${REMOTE_USER}@${REMOTE_HOST}:${RIHOLE_DIR}/${CUSTOM_DNS}"
create_rsynccmd create_rsynccmd
MESSAGE="Setting Permissions on ${CUSTOM_DNS}" MESSAGE="Setting Permissions on ${CUSTOM_DNS}"
echo_stat echo_stat
CMD_TIMEOUT='15' CMD_TIMEOUT='15'
CMD_REQUESTED="sudo chmod 644 ${RIHOLE_DIR}/${CUSTOM_DNS}" CMD_REQUESTED="sudo chmod 644 ${RIHOLE_DIR}/${CUSTOM_DNS}"
create_sshcmd create_sshcmd
MESSAGE="Setting Ownership on ${CUSTOM_DNS}" MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
echo_stat echo_stat
CMD_TIMEOUT='15' CMD_TIMEOUT='15'
CMD_REQUESTED="sudo chown root:root ${RIHOLE_DIR}/${CUSTOM_DNS}" CMD_REQUESTED="sudo chown root:root ${RIHOLE_DIR}/${CUSTOM_DNS}"
create_sshcmd create_sshcmd
fi fi
fi fi
} }
@ -94,19 +94,19 @@ function push_gs_cust {
function push_gs_reload { function push_gs_reload {
MESSAGE="Inverting Tachyon Pulses" MESSAGE="Inverting Tachyon Pulses"
echo_info echo_info
sleep 1 sleep 1
MESSAGE="Updating Remote FTLDNS Configuration" MESSAGE="Updating Remote FTLDNS Configuration"
echo_stat echo_stat
CMD_TIMEOUT='15' CMD_TIMEOUT='15'
CMD_REQUESTED="${RH_EXEC} restartdns reloadlists" CMD_REQUESTED="${RH_EXEC} restartdns reloadlists"
create_sshcmd create_sshcmd
MESSAGE="Reloading Remote FTLDNS Services" MESSAGE="Reloading Remote FTLDNS Services"
echo_stat echo_stat
CMD_TIMEOUT='15' CMD_TIMEOUT='15'
CMD_REQUESTED="${RH_EXEC} restartdns" CMD_REQUESTED="${RH_EXEC} restartdns"
create_sshcmd create_sshcmd
} }
## Push Function ## Push Function
@ -116,11 +116,11 @@ function push_gs {
backup_settime backup_settime
intent_validate intent_validate
push_gs_grav push_gs_grav
push_gs_cust push_gs_cust
push_gs_reload push_gs_reload
md5_recheck md5_recheck
logs_export logs_export
exit_withchange exit_withchange

178
includes/gs-restore.sh
View File

@ -9,12 +9,12 @@ function task_restore {
TASKTYPE='RESTORE' TASKTYPE='RESTORE'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
show_target show_target
validate_gs_folders validate_gs_folders
validate_ph_folders validate_ph_folders
validate_sqlite3 validate_sqlite3
restore_gs restore_gs
exit exit
} }
@ -23,162 +23,162 @@ function task_restore {
function restore_gs { function restore_gs {
MESSAGE="This will restore your settings on $HOSTNAME with a previous version!" MESSAGE="This will restore your settings on $HOSTNAME with a previous version!"
echo_warn echo_warn
MESSAGE="PREVIOUS BACKUPS AVAILABLE FOR RESTORATION" MESSAGE="PREVIOUS BACKUPS AVAILABLE FOR RESTORATION"
echo_info echo_info
ls ${LOCAL_FOLDR}/${BACKUP_FOLD} | grep $(date +%Y) | grep ${GRAVITY_FI} | colrm 18 ls ${LOCAL_FOLDR}/${BACKUP_FOLD} | grep $(date +%Y) | grep ${GRAVITY_FI} | colrm 18
MESSAGE="Select backup date to restore ${GRAVITY_FI} from" MESSAGE="Select backup date to restore ${GRAVITY_FI} from"
echo_need echo_need
read INPUT_BACKUP_DATE read INPUT_BACKUP_DATE
if [ -f ${LOCAL_FOLDR}/${BACKUP_FOLD}/${INPUT_BACKUP_DATE}-${GRAVITY_FI}.backup ] if [ -f ${LOCAL_FOLDR}/${BACKUP_FOLD}/${INPUT_BACKUP_DATE}-${GRAVITY_FI}.backup ]
then then
MESSAGE="Backup File Selected" MESSAGE="Backup File Selected"
else else
MESSAGE="Invalid Request" MESSAGE="Invalid Request"
echo_info echo_info
exit_nochange exit_nochange
fi fi
if [ "$SKIP_CUSTOM" != '1' ] if [ "$SKIP_CUSTOM" != '1' ]
then then
if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ] if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ]
then then
ls ${LOCAL_FOLDR}/${BACKUP_FOLD} | grep $(date +%Y) | grep ${CUSTOM_DNS} | colrm 18 ls ${LOCAL_FOLDR}/${BACKUP_FOLD} | grep $(date +%Y) | grep ${CUSTOM_DNS} | colrm 18
MESSAGE="Select backup date to restore ${CUSTOM_DNS} from" MESSAGE="Select backup date to restore ${CUSTOM_DNS} from"
echo_need echo_need
read INPUT_DNSBACKUP_DATE read INPUT_DNSBACKUP_DATE
if [ -f ${LOCAL_FOLDR}/${BACKUP_FOLD}/${INPUT_DNSBACKUP_DATE}-${CUSTOM_DNS}.backup ] if [ -f ${LOCAL_FOLDR}/${BACKUP_FOLD}/${INPUT_DNSBACKUP_DATE}-${CUSTOM_DNS}.backup ]
then then
MESSAGE="Backup File Selected" MESSAGE="Backup File Selected"
else else
MESSAGE="Invalid Request" MESSAGE="Invalid Request"
echo_info echo_info
exit_nochange exit_nochange
fi fi
fi fi
fi fi
MESSAGE="${GRAVITY_FI} from ${INPUT_BACKUP_DATE} Selected" MESSAGE="${GRAVITY_FI} from ${INPUT_BACKUP_DATE} Selected"
echo_info echo_info
MESSAGE="${CUSTOM_DNS} from ${INPUT_DNSBACKUP_DATE} Selected" MESSAGE="${CUSTOM_DNS} from ${INPUT_DNSBACKUP_DATE} Selected"
echo_info echo_info
intent_validate intent_validate
MESSAGE="Making Time Warp Calculations" MESSAGE="Making Time Warp Calculations"
echo_info echo_info
MESSAGE="Stopping Pi-hole Services" MESSAGE="Stopping Pi-hole Services"
echo_stat echo_stat
sudo service pihole-FTL stop >/dev/null 2>&1 sudo service pihole-FTL stop >/dev/null 2>&1
error_validate error_validate
MESSAGE="Restoring ${GRAVITY_FI} on $HOSTNAME" MESSAGE="Restoring ${GRAVITY_FI} on $HOSTNAME"
echo_stat echo_stat
sudo cp ${LOCAL_FOLDR}/${BACKUP_FOLD}/${INPUT_BACKUP_DATE}-${GRAVITY_FI}.backup ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1 sudo cp ${LOCAL_FOLDR}/${BACKUP_FOLD}/${INPUT_BACKUP_DATE}-${GRAVITY_FI}.backup ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate error_validate
MESSAGE="Validating Ownership on ${GRAVITY_FI}" MESSAGE="Validating Ownership on ${GRAVITY_FI}"
echo_stat echo_stat
GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk 'OFS=":" {print $3,$4}')
if [ "$GRAVDB_OWN" == "$FILE_OWNER" ]
then
echo_good
else
echo_fail
GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk 'OFS=":" {print $3,$4}') MESSAGE="Attempting to Compensate"
if [ "$GRAVDB_OWN" == "$FILE_OWNER" ] echo_warn
then
echo_good
else
echo_fail
MESSAGE="Attempting to Compensate"
echo_warn
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
echo_stat
sudo chown ${FILE_OWNER} ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate
fi
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
echo_stat
sudo chown ${FILE_OWNER} ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate
fi
MESSAGE="Validating Permissions on ${GRAVITY_FI}" MESSAGE="Validating Permissions on ${GRAVITY_FI}"
echo_stat echo_stat
GRAVDB_RWE=$(namei -m ${PIHOLE_DIR}/${GRAVITY_FI} | grep -v f: | 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-rw-r--" ] if [ "$GRAVDB_RWE" = "-rw-rw-r--" ]
then then
echo_good echo_good
else else
echo_fail echo_fail
MESSAGE="Attempting to Compensate"
echo_warn
MESSAGE="Setting Ownership on ${GRAVITY_FI}" MESSAGE="Attempting to Compensate"
echo_stat echo_warn
sudo chmod 664 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate MESSAGE="Setting Ownership on ${GRAVITY_FI}"
fi echo_stat
sudo chmod 664 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
error_validate
fi
if [ "$SKIP_CUSTOM" != '1' ] if [ "$SKIP_CUSTOM" != '1' ]
then then
if [ -f ${LOCAL_FOLDR}/${BACKUP_FOLD}/${INPUT_DNSBACKUP_DATE}-${CUSTOM_DNS}.backup ] if [ -f ${LOCAL_FOLDR}/${BACKUP_FOLD}/${INPUT_DNSBACKUP_DATE}-${CUSTOM_DNS}.backup ]
then then
MESSAGE="Restoring ${CUSTOM_DNS} on $HOSTNAME" MESSAGE="Restoring ${CUSTOM_DNS} on $HOSTNAME"
echo_stat echo_stat
sudo cp ${LOCAL_FOLDR}/${BACKUP_FOLD}/${INPUT_DNSBACKUP_DATE}-${CUSTOM_DNS}.backup ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1 sudo cp ${LOCAL_FOLDR}/${BACKUP_FOLD}/${INPUT_DNSBACKUP_DATE}-${CUSTOM_DNS}.backup ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
error_validate error_validate
MESSAGE="Validating Ownership on ${CUSTOM_DNS}" MESSAGE="Validating Ownership on ${CUSTOM_DNS}"
echo_stat echo_stat
CUSTOMLS_OWN=$(ls -ld ${PIHOLE_DIR}/${CUSTOM_DNS} | awk '{print $3 $4}')
if [ "$CUSTOMLS_OWN" == "rootroot" ]
then
echo_good
else
echo_fail
CUSTOMLS_OWN=$(ls -ld ${PIHOLE_DIR}/${CUSTOM_DNS} | awk '{print $3 $4}') MESSAGE="Attempting to Compensate"
if [ "$CUSTOMLS_OWN" == "rootroot" ] echo_warn
then
echo_good
else
echo_fail
MESSAGE="Attempting to Compensate"
echo_warn
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
echo_stat
sudo chown root:root ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
error_validate
fi
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
echo_stat
sudo chown root:root ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
error_validate
fi
MESSAGE="Validating Permissions on ${CUSTOM_DNS}" MESSAGE="Validating Permissions on ${CUSTOM_DNS}"
echo_stat echo_stat
CUSTOMLS_RWE=$(namei -m ${PIHOLE_DIR}/${CUSTOM_DNS} | grep -v f: | grep ${CUSTOM_DNS} | awk '{print $1}') 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 then
echo_good echo_good
else else
echo_fail echo_fail
MESSAGE="Attempting to Compensate"
echo_warn
MESSAGE="Setting Ownership on ${CUSTOM_DNS}" MESSAGE="Attempting to Compensate"
echo_stat echo_warn
sudo chmod 644 ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
error_validate MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
fi echo_stat
sudo chmod 644 ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
error_validate
fi
fi fi
fi fi
pull_gs_reload pull_gs_reload
MESSAGE="Do you want to push the restored configuration to the primary Pi-hole? (yes/no)" MESSAGE="Do you want to push the restored configuration to the primary Pi-hole? (yes/no)"
echo_need echo_need
read PUSH_TO_PRIMARY read PUSH_TO_PRIMARY
if [ "${PUSH_TO_PRIMARY}" == "Yes" ] || [ "${PUSH_TO_PRIMARY}" == "yes" ] || [ "${PUSH_TO_PRIMARY}" == "Y" ] || [ "${PUSH_TO_PRIMARY}" == "y" ] if [ "${PUSH_TO_PRIMARY}" == "Yes" ] || [ "${PUSH_TO_PRIMARY}" == "yes" ] || [ "${PUSH_TO_PRIMARY}" == "Y" ] || [ "${PUSH_TO_PRIMARY}" == "y" ]
then then
push_gs push_gs
@ -189,7 +189,7 @@ function restore_gs {
else else
MESSAGE="Invalid Selection - Defaulting No" MESSAGE="Invalid Selection - Defaulting No"
echo_warn echo_warn
logs_export logs_export
exit_withchange exit_withchange
fi fi

22
includes/gs-root.sh
View File

@ -9,19 +9,19 @@ function task_sudo {
TASKTYPE='SUDO' TASKTYPE='SUDO'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
MESSAGE="Creating Sudoer.d Template" MESSAGE="Creating Sudoer.d Template"
echo_stat echo_stat
NEW_SUDO_USER=$(whoami) NEW_SUDO_USER=$(whoami)
echo -e "${NEW_SUDO_USER} ALL=(ALL) NOPASSWD: ALL" > ${LOCAL_FOLDR}/templates/gs-nopasswd.sudo echo -e "${NEW_SUDO_USER} ALL=(ALL) NOPASSWD: ALL" > ${LOCAL_FOLDR}/templates/gs-nopasswd.sudo
error_validate error_validate
MESSAGE="Installing Sudoer.d File" MESSAGE="Installing Sudoer.d File"
echo_stat echo_stat
sudo install -m 0440 ${LOCAL_FOLDR}/templates/gs-nopasswd.sudo /etc/sudoers.d/gs-nopasswd sudo install -m 0440 ${LOCAL_FOLDR}/templates/gs-nopasswd.sudo /etc/sudoers.d/gs-nopasswd
error_validate error_validate
exit_withchange exit_withchange
} }
@ -29,11 +29,11 @@ function task_sudo {
## Root Check ## Root Check
function root_check { function root_check {
if [ ! "$EUID" -ne 0 ] if [ ! "$EUID" -ne 0 ]
then then
TASKTYPE='ROOT' TASKTYPE='ROOT'
MESSAGE="${MESSAGE} ${TASKTYPE}" MESSAGE="${MESSAGE} ${TASKTYPE}"
echo_fail echo_fail
MESSAGE="${PROGRAM} Should Not Run As 'root'" MESSAGE="${PROGRAM} Should Not Run As 'root'"
echo_warn echo_warn
@ -56,16 +56,16 @@ function new_root_check {
LOCALADMIN="sudo" LOCALADMIN="sudo"
fi fi
fi fi
if [ "$LOCALADMIN" == "nosudo" ] if [ "$LOCALADMIN" == "nosudo" ]
then then
TASKTYPE='ROOT' TASKTYPE='ROOT'
MESSAGE="${MESSAGE} ${TASKTYPE}" MESSAGE="${MESSAGE} ${TASKTYPE}"
echo_fail echo_fail
MESSAGE="Insufficent User Rights" MESSAGE="Insufficent User Rights"
echo_warn echo_warn
exit_nochange exit_nochange
fi fi
} }

88
includes/gs-smart.sh
View File

@ -9,13 +9,13 @@ function task_smart {
TASKTYPE='SMART' TASKTYPE='SMART'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
show_target show_target
validate_gs_folders validate_gs_folders
validate_ph_folders validate_ph_folders
validate_sqlite3 validate_sqlite3
validate_os_sshpass validate_os_sshpass
smart_gs smart_gs
exit exit
} }
@ -28,7 +28,7 @@ function smart_gs {
previous_md5 previous_md5
md5_compare md5_compare
backup_settime backup_settime
PRIDBCHANGE="0" PRIDBCHANGE="0"
SECDBCHANGE="0" SECDBCHANGE="0"
PRICLCHANGE="0" PRICLCHANGE="0"
@ -43,31 +43,31 @@ function smart_gs {
then then
SECDBCHANGE="1" SECDBCHANGE="1"
fi fi
if [ "${PRIDBCHANGE}" == "${SECDBCHANGE}" ] if [ "${PRIDBCHANGE}" == "${SECDBCHANGE}" ]
then then
if [ "${PRIDBCHANGE}" != "0" ] if [ "${PRIDBCHANGE}" != "0" ]
then then
MESSAGE="Both ${GRAVITY_FI} Have Changed" MESSAGE="Both ${GRAVITY_FI} Have Changed"
echo_warn echo_warn
PRIDBDATE=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "stat -c %Y ${RIHOLE_DIR}/${GRAVITY_FI}") PRIDBDATE=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "stat -c %Y ${RIHOLE_DIR}/${GRAVITY_FI}")
SECDBDATE=$(stat -c %Y ${PIHOLE_DIR}/${GRAVITY_FI}) SECDBDATE=$(stat -c %Y ${PIHOLE_DIR}/${GRAVITY_FI})
if (( "$PRIDBDATE" >= "$SECDBDATE" )) if (( "$PRIDBDATE" >= "$SECDBDATE" ))
then then
MESSAGE="Primary ${GRAVITY_FI} Last Changed" MESSAGE="Primary ${GRAVITY_FI} Last Changed"
echo_warn echo_warn
pull_gs_grav pull_gs_grav
PULLRESTART="1" PULLRESTART="1"
else else
MESSAGE="Secondary ${GRAVITY_FI} Last Changed" MESSAGE="Secondary ${GRAVITY_FI} Last Changed"
echo_warn echo_warn
push_gs_grav push_gs_grav
PUSHRESTART="1" PUSHRESTART="1"
fi fi
fi fi
else else
if [ "${PRIDBCHANGE}" != "0" ] if [ "${PRIDBCHANGE}" != "0" ]
@ -80,7 +80,7 @@ function smart_gs {
PUSHRESTART="1" PUSHRESTART="1"
fi fi
fi fi
if [ "${primaryCLMD5}" != "${last_primaryCLMD5}" ] if [ "${primaryCLMD5}" != "${last_primaryCLMD5}" ]
then then
PRICLCHANGE="1" PRICLCHANGE="1"
@ -90,37 +90,37 @@ function smart_gs {
then then
SECCLCHANGE="1" SECCLCHANGE="1"
fi fi
if [ "$SKIP_CUSTOM" != '1' ] if [ "$SKIP_CUSTOM" != '1' ]
then then
if [ -f "${PIHOLE_DIR}/${CUSTOM_DNS}" ] if [ -f "${PIHOLE_DIR}/${CUSTOM_DNS}" ]
then then
if [ "${PRICLCHANGE}" == "${SECCLCHANGE}" ] if [ "${PRICLCHANGE}" == "${SECCLCHANGE}" ]
then then
if [ "${PRICLCHANGE}" != "0" ] if [ "${PRICLCHANGE}" != "0" ]
then then
MESSAGE="Both ${CUSTOM_DNS} Have Changed" MESSAGE="Both ${CUSTOM_DNS} Have Changed"
echo_warn echo_warn
PRICLDATE=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "stat -c %Y ${RIHOLE_DIR}/${CUSTOM_DNS}") PRICLDATE=$(${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} "stat -c %Y ${RIHOLE_DIR}/${CUSTOM_DNS}")
SECCLDATE=$(stat -c %Y ${PIHOLE_DIR}/${CUSTOM_DNS}) SECCLDATE=$(stat -c %Y ${PIHOLE_DIR}/${CUSTOM_DNS})
if (( "$PRICLDATE" >= "$SECCLDATE" )) if (( "$PRICLDATE" >= "$SECCLDATE" ))
then then
MESSAGE="Primary ${CUSTOM_DNS} Last Changed" MESSAGE="Primary ${CUSTOM_DNS} Last Changed"
echo_warn echo_warn
pull_gs_cust pull_gs_cust
PULLRESTART="1" PULLRESTART="1"
else else
MESSAGE="Secondary ${CUSTOM_DNS} Last Changed" MESSAGE="Secondary ${CUSTOM_DNS} Last Changed"
echo_warn echo_warn
push_gs_cust push_gs_cust
PUSHRESTART="1" PUSHRESTART="1"
fi fi
fi fi
else else
if [ "${PRICLCHANGE}" != "0" ] if [ "${PRICLCHANGE}" != "0" ]
@ -138,19 +138,19 @@ function smart_gs {
PULLRESTART="1" PULLRESTART="1"
fi fi
fi fi
if [ "$PULLRESTART" == "1" ] if [ "$PULLRESTART" == "1" ]
then then
pull_gs_reload pull_gs_reload
fi fi
if [ "$PUSHRESTART" == "1" ] if [ "$PUSHRESTART" == "1" ]
then then
push_gs_reload push_gs_reload
fi fi
md5_recheck md5_recheck
logs_export logs_export
exit_withchange exit_withchange
} }

78
includes/gs-ssh.sh
View File

@ -10,8 +10,8 @@ function create_sshcmd {
# then # then
# if [ -z "$SSHPASSWORD" ] # if [ -z "$SSHPASSWORD" ]
# then # then
timeout --preserve-status ${CMD_TIMEOUT} ${SSH_CMD} -p ${SSH_PORT} -i $HOME/${SSH_PKIF} -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} "${CMD_REQUESTED}" timeout --preserve-status ${CMD_TIMEOUT} ${SSH_CMD} -p ${SSH_PORT} -i $HOME/${SSH_PKIF} -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} "${CMD_REQUESTED}"
error_validate error_validate
# else # else
# timeout --preserve-status ${CMD_TIMEOUT} ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} "${CMD_REQUESTED}" # timeout --preserve-status ${CMD_TIMEOUT} ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} "${CMD_REQUESTED}"
# error_validate # error_validate
@ -25,8 +25,8 @@ function create_rsynccmd {
# then # then
# if [ -z "$SSHPASSWORD" ] # if [ -z "$SSHPASSWORD" ]
# then # then
rsync --rsync-path="${RSYNC_REPATH}" -e "${SSH_CMD} -p ${SSH_PORT} -i $HOME/${SSH_PKIF}" ${RSYNC_SOURCE} ${RSYNC_TARGET} >/dev/null 2>&1 rsync --rsync-path="${RSYNC_REPATH}" -e "${SSH_CMD} -p ${SSH_PORT} -i $HOME/${SSH_PKIF}" ${RSYNC_SOURCE} ${RSYNC_TARGET} >/dev/null 2>&1
error_validate error_validate
# else # else
# rsync --rsync-path="${RSYNC_REPATH}" -e "${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i $HOME/${SSH_PKIF}" ${RSYNC_SOURCE} ${RSYNC_TARGET} >/dev/null 2>&1 # rsync --rsync-path="${RSYNC_REPATH}" -e "${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i $HOME/${SSH_PKIF}" ${RSYNC_SOURCE} ${RSYNC_TARGET} >/dev/null 2>&1
# error_validate # error_validate
@ -37,7 +37,7 @@ function create_rsynccmd {
## Detect SSH-KEYGEN ## Detect SSH-KEYGEN
function detect_sshkeygen { function detect_sshkeygen {
MESSAGE="Validating SSH-KEYGEN install on $HOSTNAME" MESSAGE="Validating SSH-KEYGEN install on $HOSTNAME"
echo_stat echo_stat
if hash ssh-keygen >/dev/null 2>&1 if hash ssh-keygen >/dev/null 2>&1
then then
@ -47,7 +47,7 @@ function detect_sshkeygen {
MESSAGE="SSH-KEYGEN is Required" MESSAGE="SSH-KEYGEN is Required"
echo_info echo_info
exit_nochange exit_nochange
fi fi
} }
@ -65,12 +65,12 @@ function generate_sshkey {
echo_stat echo_stat
ssh-keygen -q -P "" -t rsa -f $HOME/${SSH_PKIF} >/dev/null 2>&1 ssh-keygen -q -P "" -t rsa -f $HOME/${SSH_PKIF} >/dev/null 2>&1
error_validate error_validate
else else
MESSAGE="No SSH Key Generator Located" MESSAGE="No SSH Key Generator Located"
echo_warn echo_warn
exit_nochange exit_nochange
fi fi
fi fi
fi fi
} }
@ -85,8 +85,8 @@ function export_sshkey {
ssh-copy-id -f -p ${SSH_PORT} -i $HOME/${SSH_PKIF}.pub ${REMOTE_USER}@${REMOTE_HOST} ssh-copy-id -f -p ${SSH_PORT} -i $HOME/${SSH_PKIF}.pub ${REMOTE_USER}@${REMOTE_HOST}
else else
MESSAGE="Error Registering Key-Pair" MESSAGE="Error Registering Key-Pair"
echo_warn echo_warn
fi fi
fi fi
} }
@ -95,7 +95,7 @@ function export_sshkey {
function detect_ssh { function detect_ssh {
MESSAGE="Validating SSH Client on $HOSTNAME" MESSAGE="Validating SSH Client on $HOSTNAME"
echo_stat echo_stat
if hash ssh 2>/dev/null if hash ssh 2>/dev/null
then then
MESSAGE="${MESSAGE} (OpenSSH)" MESSAGE="${MESSAGE} (OpenSSH)"
@ -105,10 +105,10 @@ function detect_ssh {
then then
MESSAGE="${MESSAGE} (Dropbear)" MESSAGE="${MESSAGE} (Dropbear)"
echo_fail echo_fail
MESSAGE="Dropbear not supported in GS ${VERSION}" MESSAGE="Dropbear not supported in GS ${VERSION}"
echo_info echo_info
exit_nochange exit_nochange
else else
echo_fail echo_fail
@ -118,12 +118,12 @@ function detect_ssh {
echo_stat echo_stat
${PKG_INSTALL} ssh-client >/dev/null 2>&1 ${PKG_INSTALL} ssh-client >/dev/null 2>&1
error_validate error_validate
fi fi
MESSAGE="Validating RSYNC Installed on $HOSTNAME" MESSAGE="Validating RSYNC Installed on $HOSTNAME"
echo_stat echo_stat
if hash rsync 2>/dev/null if hash rsync 2>/dev/null
then then
echo_good echo_good
@ -131,55 +131,55 @@ function detect_ssh {
echo_fail echo_fail
MESSAGE="RSYNC is Required" MESSAGE="RSYNC is Required"
echo_warn echo_warn
distro_check distro_check
MESSAGE="Attempting to Compensate" MESSAGE="Attempting to Compensate"
echo_warn echo_warn
MESSAGE="Installing RSYNC with ${PKG_MANAGER}" MESSAGE="Installing RSYNC with ${PKG_MANAGER}"
echo_stat echo_stat
${PKG_INSTALL} rsync >/dev/null 2>&1 ${PKG_INSTALL} rsync >/dev/null 2>&1
error_validate error_validate
fi fi
} }
function detect_remotersync { function detect_remotersync {
MESSAGE="Creating Test File on ${REMOTE_HOST}" MESSAGE="Creating Test File on ${REMOTE_HOST}"
echo_stat echo_stat
CMD_TIMEOUT='15' CMD_TIMEOUT='15'
CMD_REQUESTED="touch ~/gs.test" CMD_REQUESTED="touch ~/gs.test"
create_sshcmd create_sshcmd
MESSAGE="If pull test fails ensure RSYNC is installed on ${REMOTE_HOST}" MESSAGE="If pull test fails ensure RSYNC is installed on ${REMOTE_HOST}"
echo_warn echo_warn
MESSAGE="Pulling Test File to $HOSTNAME" MESSAGE="Pulling Test File to $HOSTNAME"
echo_stat echo_stat
RSYNC_REPATH="rsync" RSYNC_REPATH="rsync"
RSYNC_SOURCE="${REMOTE_USER}@${REMOTE_HOST}:~/gs.test" RSYNC_SOURCE="${REMOTE_USER}@${REMOTE_HOST}:~/gs.test"
RSYNC_TARGET="${LOCAL_FOLDR}/gs.test" RSYNC_TARGET="${LOCAL_FOLDR}/gs.test"
create_rsynccmd create_rsynccmd
MESSAGE="Cleaning Up Local Test File" MESSAGE="Cleaning Up Local Test File"
echo_stat echo_stat
rm ${LOCAL_FOLDR}/gs.test rm ${LOCAL_FOLDR}/gs.test
error_validate error_validate
MESSAGE="Cleaning Up Remote Test File" MESSAGE="Cleaning Up Remote Test File"
echo_stat echo_stat
CMD_TIMEOUT='15' CMD_TIMEOUT='15'
CMD_REQUESTED="rm ~/gs.test" CMD_REQUESTED="rm ~/gs.test"
create_sshcmd create_sshcmd
} }
function show_target { function show_target {
MESSAGE="Targeting ${REMOTE_USER}@${REMOTE_HOST}" MESSAGE="Targeting ${REMOTE_USER}@${REMOTE_HOST}"
echo_info echo_info
detect_ssh detect_ssh
} }

44
includes/gs-update.sh
View File

@ -12,28 +12,28 @@ function update_gs {
else else
BRANCH='origin/master' BRANCH='origin/master'
fi fi
if [ "$BRANCH" != "origin/master" ] if [ "$BRANCH" != "origin/master" ]
then then
MESSAGE="Pulling from ${BRANCH}" MESSAGE="Pulling from ${BRANCH}"
echo_info echo_info
fi fi
GIT_CHECK=$(git status | awk '{print $1}') GIT_CHECK=$(git status | awk '{print $1}')
if [ "$GIT_CHECK" == "fatal:" ] if [ "$GIT_CHECK" == "fatal:" ]
then then
MESSAGE="Requires GitHub Installation" MESSAGE="Requires GitHub Installation"
echo_warn echo_warn
exit_nochange exit_nochange
else else
MESSAGE="Updating Cache" MESSAGE="Updating Cache"
echo_stat echo_stat
git fetch --all >/dev/null 2>&1 git fetch --all >/dev/null 2>&1
error_validate error_validate
MESSAGE="Applying Update" MESSAGE="Applying Update"
echo_stat echo_stat
git reset --hard ${BRANCH} >/dev/null 2>&1 git reset --hard ${BRANCH} >/dev/null 2>&1
error_validate error_validate
fi fi
} }
@ -42,15 +42,15 @@ function show_version {
echo -e "========================================================" echo -e "========================================================"
MESSAGE="${BOLD}${PROGRAM}${NC} by ${CYAN}@vmstan${NC}" MESSAGE="${BOLD}${PROGRAM}${NC} by ${CYAN}@vmstan${NC}"
echo_info echo_info
MESSAGE="${BLUE}https://github.com/vmstan/gravity-sync${NC}" MESSAGE="${BLUE}https://github.com/vmstan/gravity-sync${NC}"
echo_info echo_info
if [ -f ${LOCAL_FOLDR}/dev ] if [ -f ${LOCAL_FOLDR}/dev ]
then then
DEVVERSION="dev" DEVVERSION="dev"
elif [ -f ${LOCAL_FOLDR}/beta ] elif [ -f ${LOCAL_FOLDR}/beta ]
then then
DEVVERSION="beta" DEVVERSION="beta"
else else
DEVVERSION="" DEVVERSION=""
@ -58,7 +58,7 @@ function show_version {
MESSAGE="Running Version: ${GREEN}${VERSION}${NC} ${DEVVERSION}" MESSAGE="Running Version: ${GREEN}${VERSION}${NC} ${DEVVERSION}"
echo_info echo_info
GITVERSION=$(curl -sf https://raw.githubusercontent.com/vmstan/gravity-sync/master/VERSION) GITVERSION=$(curl -sf https://raw.githubusercontent.com/vmstan/gravity-sync/master/VERSION)
if [ -z "$GITVERSION" ] if [ -z "$GITVERSION" ]
then then
@ -66,9 +66,9 @@ function show_version {
else else
if [ "$GITVERSION" != "$VERSION" ] if [ "$GITVERSION" != "$VERSION" ]
then then
MESSAGE="Update Available: ${PURPLE}${GITVERSION}${NC}" MESSAGE="Update Available: ${PURPLE}${GITVERSION}${NC}"
else else
MESSAGE="Latest Version: ${GREEN}${GITVERSION}${NC}" MESSAGE="Latest Version: ${GREEN}${GITVERSION}${NC}"
fi fi
fi fi
echo_info echo_info
@ -106,35 +106,35 @@ function task_devmode {
MESSAGE="Disabling ${TASKTYPE}" MESSAGE="Disabling ${TASKTYPE}"
echo_stat echo_stat
rm -f ${LOCAL_FOLDR}/dev rm -f ${LOCAL_FOLDR}/dev
error_validate error_validate
elif [ -f ${LOCAL_FOLDR}/beta ] elif [ -f ${LOCAL_FOLDR}/beta ]
then then
MESSAGE="Disabling BETA" MESSAGE="Disabling BETA"
echo_stat echo_stat
rm -f ${LOCAL_FOLDR}/beta rm -f ${LOCAL_FOLDR}/beta
error_validate error_validate
MESSAGE="Enabling ${TASKTYPE}" MESSAGE="Enabling ${TASKTYPE}"
echo_stat echo_stat
touch ${LOCAL_FOLDR}/dev touch ${LOCAL_FOLDR}/dev
error_validate error_validate
else else
MESSAGE="Enabling ${TASKTYPE}" MESSAGE="Enabling ${TASKTYPE}"
echo_stat echo_stat
touch ${LOCAL_FOLDR}/dev touch ${LOCAL_FOLDR}/dev
error_validate error_validate
MESSAGE="Updating Cache" MESSAGE="Updating Cache"
echo_stat echo_stat
git fetch --all >/dev/null 2>&1 git fetch --all >/dev/null 2>&1
error_validate error_validate
git branch -r git branch -r
MESSAGE="Select Branch to Update Against" MESSAGE="Select Branch to Update Against"
echo_need echo_need
read INPUT_BRANCH read INPUT_BRANCH
echo -e "BRANCH='${INPUT_BRANCH}'" >> ${LOCAL_FOLDR}/dev echo -e "BRANCH='${INPUT_BRANCH}'" >> ${LOCAL_FOLDR}/dev
fi fi
@ -148,11 +148,11 @@ function task_update {
TASKTYPE='UPDATE' TASKTYPE='UPDATE'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
dbclient_warning dbclient_warning
update_gs update_gs
exit_withchange exit_withchange
} }
@ -161,7 +161,7 @@ function task_version {
TASKTYPE='VERSION' TASKTYPE='VERSION'
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested" MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
echo_good echo_good
show_version show_version
exit_nochange exit_nochange
} }

104
includes/gs-validate.sh
View File

@ -8,19 +8,19 @@
function validate_gs_folders { function validate_gs_folders {
MESSAGE="Validating ${PROGRAM} Folders on $HOSTNAME" MESSAGE="Validating ${PROGRAM} Folders on $HOSTNAME"
echo_stat echo_stat
if [ ! -d ${LOCAL_FOLDR} ] if [ ! -d ${LOCAL_FOLDR} ]
then then
MESSAGE="Unable to Validate ${PROGRAM} Folders on $HOSTNAME" MESSAGE="Unable to Validate ${PROGRAM} Folders on $HOSTNAME"
echo_fail echo_fail
exit_nochange exit_nochange
fi fi
if [ ! -d ${LOCAL_FOLDR}/${BACKUP_FOLD} ] if [ ! -d ${LOCAL_FOLDR}/${BACKUP_FOLD} ]
then then
MESSAGE="Unable to Validate ${PROGRAM} Backup Folder on $HOSTNAME" MESSAGE="Unable to Validate ${PROGRAM} Backup Folder on $HOSTNAME"
echo_fail echo_fail
exit_nochange exit_nochange
fi fi
echo_good echo_good
} }
@ -29,31 +29,31 @@ function validate_ph_folders {
MESSAGE="Validating Pi-hole Configuration" MESSAGE="Validating Pi-hole Configuration"
echo_stat echo_stat
if [ "$PH_IN_TYPE" == "default" ] if [ "$PH_IN_TYPE" == "default" ]
then
if [ ! -f ${PIHOLE_BIN} ]
then then
if [ ! -f ${PIHOLE_BIN} ] MESSAGE="Unable to Validate that Pi-Hole is Installed"
then
MESSAGE="Unable to Validate that Pi-Hole is Installed"
echo_fail
exit_nochange
fi
elif [ "$PH_IN_TYPE" == "docker" ]
then
FTLCHECK=$(sudo docker container ls | grep 'pihole/pihole')
if [ "$FTLCHECK" == "" ]
then
MESSAGE="Unable to Validate that Pi-Hole is Installed"
echo_fail
exit_nochange
fi
fi
if [ ! -d ${PIHOLE_DIR} ]
then
MESSAGE="Unable to Validate Pi-Hole Configuration Directory"
echo_fail echo_fail
exit_nochange exit_nochange
fi fi
elif [ "$PH_IN_TYPE" == "docker" ]
then
FTLCHECK=$(sudo docker container ls | grep 'pihole/pihole')
if [ "$FTLCHECK" == "" ]
then
MESSAGE="Unable to Validate that Pi-Hole is Installed"
echo_fail
exit_nochange
fi
fi
if [ ! -d ${PIHOLE_DIR} ]
then
MESSAGE="Unable to Validate Pi-Hole Configuration Directory"
echo_fail
exit_nochange
fi
echo_good echo_good
} }
@ -61,26 +61,26 @@ function validate_ph_folders {
function validate_sqlite3 { function validate_sqlite3 {
MESSAGE="Validating SQLITE Installed on $HOSTNAME" MESSAGE="Validating SQLITE Installed on $HOSTNAME"
echo_stat echo_stat
if hash sqlite3 2>/dev/null if hash sqlite3 2>/dev/null
then then
# MESSAGE="SQLITE3 Utility Detected" # MESSAGE="SQLITE3 Utility Detected"
echo_good echo_good
else else
MESSAGE="Unable to Validate SQLITE Install on $HOSTNAME" MESSAGE="Unable to Validate SQLITE Install on $HOSTNAME"
echo_warn echo_warn
MESSAGE="Installing SQLLITE3 with ${PKG_MANAGER}" MESSAGE="Installing SQLLITE3 with ${PKG_MANAGER}"
echo_stat echo_stat
${PKG_INSTALL} sqllite3 >/dev/null 2>&1 ${PKG_INSTALL} sqllite3 >/dev/null 2>&1
error_validate error_validate
fi fi
} }
## Validate SSHPASS ## Validate SSHPASS
function validate_os_sshpass { function validate_os_sshpass {
# SSHPASSWORD='' # SSHPASSWORD=''
# if hash sshpass 2>/dev/null # if hash sshpass 2>/dev/null
# then # then
# MESSAGE="SSHPASS Utility Detected" # MESSAGE="SSHPASS Utility Detected"
@ -92,7 +92,7 @@ function validate_os_sshpass {
# else # else
# MESSAGE="Testing Authentication Options" # MESSAGE="Testing Authentication Options"
# echo_stat # echo_stat
# timeout 5 ssh -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1 # timeout 5 ssh -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1
# if [ "$?" != "0" ] # if [ "$?" != "0" ]
# then # then
@ -112,15 +112,15 @@ function validate_os_sshpass {
MESSAGE="Validating Connection to ${REMOTE_HOST}" MESSAGE="Validating Connection to ${REMOTE_HOST}"
echo_stat echo_stat
CMD_TIMEOUT='5' CMD_TIMEOUT='5'
CMD_REQUESTED="exit" CMD_REQUESTED="exit"
create_sshcmd create_sshcmd
} }
## Detect Package Manager ## Detect Package Manager
function distro_check { function distro_check {
if hash apt-get 2>/dev/null if hash apt-get 2>/dev/null
then then
PKG_MANAGER="apt-get" PKG_MANAGER="apt-get"

38
prep/gs-install.sh
View File

@ -33,7 +33,7 @@ echo -e "========================================================"
# Check Root # Check Root
echo -e "[${YELLOW}i${NC}] ${YELLOW}Validating System Authorization${NC}" echo -e "[${YELLOW}i${NC}] ${YELLOW}Validating System Authorization${NC}"
if [ ! "$EUID" -ne 0 ] if [ ! "$EUID" -ne 0 ]
then then
echo -e "[${GREEN}✓${NC}] Current User (${CURRENTUSER}) is ROOT" echo -e "[${GREEN}✓${NC}] Current User (${CURRENTUSER}) is ROOT"
LOCALADMIN="root" LOCALADMIN="root"
else else
@ -208,24 +208,24 @@ else
echo -e "${CURRENTUSER} ALL=(ALL) NOPASSWD: ALL" > /tmp/gs-nopasswd.sudo echo -e "${CURRENTUSER} ALL=(ALL) NOPASSWD: ALL" > /tmp/gs-nopasswd.sudo
sudo install -m 0440 /tmp/gs-nopasswd.sudo /etc/sudoers.d/gs-nopasswd sudo install -m 0440 /tmp/gs-nopasswd.sudo /etc/sudoers.d/gs-nopasswd
fi fi
if [ "$GS_INSTALL" != "secondary" ] if [ "$GS_INSTALL" != "secondary" ]
then then
echo -e "[${YELLOW}i${NC}] Gravity Sync Preperation Complete" echo -e "[${YELLOW}i${NC}] Gravity Sync Preperation Complete"
echo -e "[${YELLOW}i${NC}] Execute on Installer on Secondary" echo -e "[${YELLOW}i${NC}] Execute on Installer on Secondary"
echo -e "[${YELLOW}i${NC}] Check Documentation for Instructions" echo -e "[${YELLOW}i${NC}] Check Documentation for Instructions"
echo -e "[${YELLOW}i${NC}] Installation Exiting (without changes)" echo -e "[${YELLOW}i${NC}] Installation Exiting (without changes)"
else else
echo -e "[${BLUE}>${NC}] Creating Gravity Sync Directories" echo -e "[${BLUE}>${NC}] Creating Gravity Sync Directories"
git clone https://github.com/vmstan/gravity-sync.git git clone https://github.com/vmstan/gravity-sync.git
echo -e "[${BLUE}>${NC}] Starting Gravity Sync Configuration" echo -e "[${BLUE}>${NC}] Starting Gravity Sync Configuration"
echo -e "========================================================" echo -e "========================================================"
./gravity-sync/gravity-sync.sh configure <&1 ./gravity-sync/gravity-sync.sh configure <&1
# echo -e "[${YELLOW}i${NC}] This host is now prepared to configure Gravity Sync!" # echo -e "[${YELLOW}i${NC}] This host is now prepared to configure Gravity Sync!"
# echo -e "[${YELLOW}i${NC}] Please run './gravity-sync configure' from $HOME/gravity-sync" # echo -e "[${YELLOW}i${NC}] Please run './gravity-sync configure' from $HOME/gravity-sync"
# echo -e "[${YELLOW}i${NC}] Visit https://github.com/vmstan/gravity-sync for more instructions." # echo -e "[${YELLOW}i${NC}] Visit https://github.com/vmstan/gravity-sync for more instructions."
fi fi
fi fi
exit exit