mirror of
https://github.com/vmstan/gravity-sync.git
synced 2024-08-30 18:22:11 +00:00
indention change
This commit is contained in:
Michael Stanclift
parent
b2954853f1
commit
9313200b94
@ -66,6 +66,7 @@ You can now use a standard Pi-hole install as your primary, or your secondary. Y
|
|||||||
#### 3.1.2
|
#### 3.1.2
|
||||||
|
|
||||||
- Adds `./gravity-sync.sh info` screen to show output of settings and component versions.
|
- Adds `./gravity-sync.sh info` screen to show output of settings and component versions.
|
||||||
|
- Convert all bash files from mix of tabs and spaces to 4 space indentation.
|
||||||
|
|
||||||
## 3.0
|
## 3.0
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<img src="https://raw.githubusercontent.com/vmstan/gravity-sync/master/docs/gravity-header.svg" width="80%" alt="Gravity Sync">
|
<img src="https://raw.githubusercontent.com/vmstan/gravity-sync/master/docs/gravity-header.svg" width="80%" alt="Gravity Sync">
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
What is better than a [Pi-hole](https://github.com/pi-hole/pi-hole) blocking ads via DNS on your network? That's right, two Pi-hole blocking ads on your network!
|
What is better than a [Pi-hole](https://github.com/pi-hole/pi-hole) blocking ads via DNS on your network? That's right, two Pi-hole blocking ads on your network!
|
||||||
|
|||||||
152
gravity-sync.sh
152
gravity-sync.sh
@ -107,84 +107,84 @@ source ${LOCAL_FOLDR}/includes/gs-exit.sh
|
|||||||
# SCRIPT EXECUTION ###########################
|
# SCRIPT EXECUTION ###########################
|
||||||
|
|
||||||
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 ##############################
|
||||||
@ -6,109 +6,109 @@
|
|||||||
|
|
||||||
## Automate Task
|
## Automate Task
|
||||||
function task_automate {
|
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 ]
|
||||||
then
|
then
|
||||||
MESSAGE="Automation Task Already Exists"
|
MESSAGE="Automation Task Already Exists"
|
||||||
echo_info
|
echo_info
|
||||||
CRON_EXIST='1'
|
CRON_EXIST='1'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
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
|
||||||
else
|
else
|
||||||
MESSAGE="Sync Frequency in Minutes (1-30) or 0 to Disable"
|
MESSAGE="Sync Frequency in Minutes (1-30) or 0 to Disable"
|
||||||
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"
|
||||||
echo_fail
|
echo_fail
|
||||||
exit_nochange
|
exit_nochange
|
||||||
elif [ $INPUT_AUTO_FREQ -lt 1 ]
|
elif [ $INPUT_AUTO_FREQ -lt 1 ]
|
||||||
then
|
then
|
||||||
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
|
||||||
MESSAGE="No Sync Automation Scheduled"
|
MESSAGE="No Sync Automation Scheduled"
|
||||||
echo_warn
|
echo_warn
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [ $CRON_EXIST == 1 ]
|
if [ $CRON_EXIST == 1 ]
|
||||||
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
|
||||||
else
|
else
|
||||||
MESSAGE="Hour of Day to Backup (1-24) or 0 to Disable"
|
MESSAGE="Hour of Day to Backup (1-24) or 0 to Disable"
|
||||||
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"
|
||||||
echo_fail
|
echo_fail
|
||||||
exit_nochange
|
exit_nochange
|
||||||
elif [ $INPUT_AUTO_BACKUP -lt 1 ]
|
elif [ $INPUT_AUTO_BACKUP -lt 1 ]
|
||||||
then
|
then
|
||||||
MESSAGE="No Backup Automation Scheduled"
|
MESSAGE="No Backup Automation Scheduled"
|
||||||
echo_warn
|
echo_warn
|
||||||
else
|
else
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## Clear Existing Automation Settings
|
## Clear Existing Automation Settings
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## Cron Task
|
## Cron Task
|
||||||
function task_cron {
|
function task_cron {
|
||||||
TASKTYPE='CRON'
|
TASKTYPE='CRON'
|
||||||
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
|
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
|
||||||
echo_good
|
echo_good
|
||||||
|
|
||||||
show_crontab
|
show_crontab
|
||||||
}
|
}
|
||||||
@ -6,70 +6,70 @@
|
|||||||
|
|
||||||
## Backup Task
|
## Backup Task
|
||||||
function task_backup {
|
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
|
||||||
backup_cleanup
|
backup_cleanup
|
||||||
|
|
||||||
logs_export
|
logs_export
|
||||||
exit_withchange
|
exit_withchange
|
||||||
}
|
}
|
||||||
|
|
||||||
function backup_settime {
|
function backup_settime {
|
||||||
BACKUPTIMESTAMP=$(date +%F-%H%M%S)
|
BACKUPTIMESTAMP=$(date +%F-%H%M%S)
|
||||||
}
|
}
|
||||||
|
|
||||||
function backup_local_gravity {
|
function backup_local_gravity {
|
||||||
MESSAGE="Performing Backup of Local ${GRAVITY_FI}"
|
MESSAGE="Performing Backup of Local ${GRAVITY_FI}"
|
||||||
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
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function backup_remote_gravity {
|
function backup_remote_gravity {
|
||||||
MESSAGE="Performing Backup of Remote ${GRAVITY_FI}"
|
MESSAGE="Performing Backup of Remote ${GRAVITY_FI}"
|
||||||
echo_stat
|
echo_stat
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
@ -25,30 +25,30 @@ NEED="[${BLUE}?${NC}]"
|
|||||||
## Echo Stack
|
## Echo Stack
|
||||||
### Informative
|
### Informative
|
||||||
function echo_info {
|
function echo_info {
|
||||||
echo -e "${INFO} ${YELLOW}${MESSAGE}${NC}"
|
echo -e "${INFO} ${YELLOW}${MESSAGE}${NC}"
|
||||||
}
|
}
|
||||||
|
|
||||||
### Warning
|
### Warning
|
||||||
function echo_warn {
|
function echo_warn {
|
||||||
echo -e "${WARN} ${PURPLE}${MESSAGE}${NC}"
|
echo -e "${WARN} ${PURPLE}${MESSAGE}${NC}"
|
||||||
}
|
}
|
||||||
|
|
||||||
### Executing
|
### Executing
|
||||||
function echo_stat {
|
function echo_stat {
|
||||||
echo -en "${STAT} ${MESSAGE}"
|
echo -en "${STAT} ${MESSAGE}"
|
||||||
}
|
}
|
||||||
|
|
||||||
### Success
|
### Success
|
||||||
function echo_good {
|
function echo_good {
|
||||||
echo -e "\r${GOOD} ${MESSAGE}"
|
echo -e "\r${GOOD} ${MESSAGE}"
|
||||||
}
|
}
|
||||||
|
|
||||||
### Failure
|
### Failure
|
||||||
function echo_fail {
|
function echo_fail {
|
||||||
echo -e "\r${FAIL} ${MESSAGE}"
|
echo -e "\r${FAIL} ${MESSAGE}"
|
||||||
}
|
}
|
||||||
|
|
||||||
### Request
|
### Request
|
||||||
function echo_need {
|
function echo_need {
|
||||||
echo -en "${NEED} ${MESSAGE}: "
|
echo -en "${NEED} ${MESSAGE}: "
|
||||||
}
|
}
|
||||||
@ -1,15 +1,15 @@
|
|||||||
## Compare Task
|
## Compare Task
|
||||||
function task_compare {
|
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
|
||||||
validate_os_sshpass
|
validate_os_sshpass
|
||||||
|
|
||||||
previous_md5
|
previous_md5
|
||||||
md5_compare
|
md5_compare
|
||||||
exit_withchange
|
exit_withchange
|
||||||
}
|
}
|
||||||
@ -6,346 +6,346 @@
|
|||||||
|
|
||||||
## Configure Task
|
## Configure Task
|
||||||
function task_configure {
|
function task_configure {
|
||||||
TASKTYPE='CONFIGURE'
|
TASKTYPE='CONFIGURE'
|
||||||
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
|
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
|
||||||
echo_good
|
echo_good
|
||||||
|
|
||||||
if [ -f ${LOCAL_FOLDR}/${CONFIG_FILE} ]
|
if [ -f ${LOCAL_FOLDR}/${CONFIG_FILE} ]
|
||||||
then
|
then
|
||||||
config_delete
|
config_delete
|
||||||
else
|
else
|
||||||
config_generate
|
config_generate
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# backup_settime
|
# backup_settime
|
||||||
# backup_local_gravity
|
# backup_local_gravity
|
||||||
# backup_local_custom
|
# backup_local_custom
|
||||||
# backup_cleanup
|
# backup_cleanup
|
||||||
|
|
||||||
create_alias
|
create_alias
|
||||||
|
|
||||||
exit_withchange
|
exit_withchange
|
||||||
}
|
}
|
||||||
|
|
||||||
## Generate New Configuration
|
## Generate New Configuration
|
||||||
function config_generate {
|
function config_generate {
|
||||||
# detect_ssh
|
# detect_ssh
|
||||||
|
|
||||||
MESSAGE="Creating New ${CONFIG_FILE} from Template"
|
MESSAGE="Creating New ${CONFIG_FILE} from Template"
|
||||||
echo_stat
|
echo_stat
|
||||||
cp ${LOCAL_FOLDR}/${CONFIG_FILE}.example ${LOCAL_FOLDR}/${CONFIG_FILE}
|
cp ${LOCAL_FOLDR}/${CONFIG_FILE}.example ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
|
|
||||||
docker_detect
|
docker_detect
|
||||||
if [ "${DOCKERREADY}" == "1" ]
|
if [ "${DOCKERREADY}" == "1" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Advanced Configuration Required"
|
MESSAGE="Advanced Configuration Required"
|
||||||
echo_info
|
echo_info
|
||||||
advanced_config_generate
|
advanced_config_generate
|
||||||
else
|
else
|
||||||
MESSAGE="Use Advanced Installation Options? (Leave blank for default 'No')"
|
MESSAGE="Use Advanced Installation Options? (Leave blank for default 'No')"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_ADVANCED_INSTALL
|
read INPUT_ADVANCED_INSTALL
|
||||||
INPUT_ADVANCED_INSTALL="${INPUT_ADVANCED_INSTALL:-N}"
|
INPUT_ADVANCED_INSTALL="${INPUT_ADVANCED_INSTALL:-N}"
|
||||||
|
|
||||||
if [ "${INPUT_ADVANCED_INSTALL}" != "N" ]
|
if [ "${INPUT_ADVANCED_INSTALL}" != "N" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Advanced Configuration Selected"
|
MESSAGE="Advanced Configuration Selected"
|
||||||
echo_info
|
echo_info
|
||||||
|
|
||||||
advanced_config_generate
|
advanced_config_generate
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MESSAGE="Standard Settings"
|
MESSAGE="Standard Settings"
|
||||||
echo_info
|
echo_info
|
||||||
|
|
||||||
MESSAGE="Primary Pi-hole Address (IP or DNS)"
|
MESSAGE="Primary Pi-hole Address (IP or DNS)"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_REMOTE_HOST
|
read INPUT_REMOTE_HOST
|
||||||
|
|
||||||
if [ "${PING_AVOID}" != "1" ]
|
if [ "${PING_AVOID}" != "1" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Testing Network Connection (ICMP)"
|
MESSAGE="Testing Network Connection (ICMP)"
|
||||||
echo_stat
|
echo_stat
|
||||||
ping -c 3 ${INPUT_REMOTE_HOST} >/dev/null 2>&1
|
ping -c 3 ${INPUT_REMOTE_HOST} >/dev/null 2>&1
|
||||||
error_validate
|
error_validate
|
||||||
else
|
else
|
||||||
MESSAGE="Bypassing Network Testing (ICMP)"
|
MESSAGE="Bypassing Network Testing (ICMP)"
|
||||||
echo_warn
|
echo_warn
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MESSAGE="SSH User for ${INPUT_REMOTE_HOST}"
|
MESSAGE="SSH User for ${INPUT_REMOTE_HOST}"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_REMOTE_USER
|
read INPUT_REMOTE_USER
|
||||||
|
|
||||||
MESSAGE="Saving Host to ${CONFIG_FILE}"
|
MESSAGE="Saving Host to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/REMOTE_HOST='192.168.1.10'/c\REMOTE_HOST='${INPUT_REMOTE_HOST}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/REMOTE_HOST='192.168.1.10'/c\REMOTE_HOST='${INPUT_REMOTE_HOST}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
|
|
||||||
MESSAGE="Saving User to ${CONFIG_FILE}"
|
MESSAGE="Saving User to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/REMOTE_USER='pi'/c\REMOTE_USER='${INPUT_REMOTE_USER}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/REMOTE_USER='pi'/c\REMOTE_USER='${INPUT_REMOTE_USER}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
|
|
||||||
generate_sshkey
|
generate_sshkey
|
||||||
|
|
||||||
MESSAGE="Importing New ${CONFIG_FILE}"
|
MESSAGE="Importing New ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
source ${LOCAL_FOLDR}/${CONFIG_FILE}
|
source ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
|
|
||||||
export_sshkey
|
export_sshkey
|
||||||
|
|
||||||
# MESSAGE="Testing Configuration"
|
# MESSAGE="Testing Configuration"
|
||||||
# echo_info
|
# echo_info
|
||||||
|
|
||||||
# validate_os_sshpass
|
# validate_os_sshpass
|
||||||
# validate_sqlite3
|
# validate_sqlite3
|
||||||
|
|
||||||
# detect_remotersync
|
# detect_remotersync
|
||||||
}
|
}
|
||||||
|
|
||||||
## Advanced Configuration Options
|
## Advanced Configuration Options
|
||||||
function advanced_config_generate {
|
function advanced_config_generate {
|
||||||
MESSAGE="Local Pi-hole in Docker Container? (Leave blank for default 'No')"
|
MESSAGE="Local Pi-hole in Docker Container? (Leave blank for default 'No')"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_PH_IN_TYPE
|
read INPUT_PH_IN_TYPE
|
||||||
INPUT_PH_IN_TYPE="${INPUT_PH_IN_TYPE:-N}"
|
INPUT_PH_IN_TYPE="${INPUT_PH_IN_TYPE:-N}"
|
||||||
|
|
||||||
if [ "${INPUT_PH_IN_TYPE}" != "N" ]
|
if [ "${INPUT_PH_IN_TYPE}" != "N" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving Local Docker Setting to ${CONFIG_FILE}"
|
MESSAGE="Saving Local Docker Setting to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# PH_IN_TYPE=''/c\PH_IN_TYPE='docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# PH_IN_TYPE=''/c\PH_IN_TYPE='docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
|
|
||||||
MESSAGE="Local Docker Container Name? (Leave blank for default 'pihole')"
|
MESSAGE="Local Docker Container Name? (Leave blank for default 'pihole')"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_DOCKER_CON
|
read INPUT_DOCKER_CON
|
||||||
INPUT_DOCKER_CON="${INPUT_DOCKER_CON:-pihole}"
|
INPUT_DOCKER_CON="${INPUT_DOCKER_CON:-pihole}"
|
||||||
|
|
||||||
if [ "${INPUT_DOCKER_CON}" != "pihole" ]
|
if [ "${INPUT_DOCKER_CON}" != "pihole" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving Local Container Name to ${CONFIG_FILE}"
|
MESSAGE="Saving Local Container Name to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# DOCKER_CON=''/c\DOCKER_CON='${INPUT_DOCKER_CON}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# DOCKER_CON=''/c\DOCKER_CON='${INPUT_DOCKER_CON}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MESSAGE="Local Pi-hole 'etc' Volume Path? (Required, no trailing slash)"
|
MESSAGE="Local Pi-hole 'etc' Volume Path? (Required, no trailing slash)"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_PIHOLE_DIR
|
read INPUT_PIHOLE_DIR
|
||||||
|
|
||||||
if [ "${INPUT_PIHOLE_DIR}" != "" ]
|
if [ "${INPUT_PIHOLE_DIR}" != "" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving Local Pi-hole Volume to ${CONFIG_FILE}"
|
MESSAGE="Saving Local Pi-hole Volume to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# PIHOLE_DIR=''/c\PIHOLE_DIR='${INPUT_PIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# PIHOLE_DIR=''/c\PIHOLE_DIR='${INPUT_PIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
SKIP_PIHOLE_DIR="1"
|
SKIP_PIHOLE_DIR="1"
|
||||||
else
|
else
|
||||||
MESSAGE="This setting is required!"
|
MESSAGE="This setting is required!"
|
||||||
echo_warn
|
echo_warn
|
||||||
exit_withchanges
|
exit_withchanges
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MESSAGE="Saving Local Volume Ownership to ${CONFIG_FILE}"
|
MESSAGE="Saving Local Volume Ownership to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# FILE_OWNER=''/c\FILE_OWNER='named:docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# FILE_OWNER=''/c\FILE_OWNER='named:docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MESSAGE="Remote Pi-hole in Docker Container? (Leave blank for default 'No')"
|
MESSAGE="Remote Pi-hole in Docker Container? (Leave blank for default 'No')"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_RH_IN_TYPE
|
read INPUT_RH_IN_TYPE
|
||||||
INPUT_RH_IN_TYPE="${INPUT_RH_IN_TYPE:-N}"
|
INPUT_RH_IN_TYPE="${INPUT_RH_IN_TYPE:-N}"
|
||||||
|
|
||||||
if [ "${INPUT_RH_IN_TYPE}" != "N" ]
|
if [ "${INPUT_RH_IN_TYPE}" != "N" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving Remote Docker Setting to ${CONFIG_FILE}"
|
MESSAGE="Saving Remote Docker Setting to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# RH_IN_TYPE=''/c\RH_IN_TYPE='docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# RH_IN_TYPE=''/c\RH_IN_TYPE='docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
|
|
||||||
MESSAGE="Remote Docker Container Name? (Leave blank for default 'pihole')"
|
MESSAGE="Remote Docker Container Name? (Leave blank for default 'pihole')"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_ROCKER_CON
|
read INPUT_ROCKER_CON
|
||||||
INPUT_ROCKER_CON="${INPUT_ROCKER_CON:-pihole}"
|
INPUT_ROCKER_CON="${INPUT_ROCKER_CON:-pihole}"
|
||||||
|
|
||||||
if [ "${INPUT_ROCKER_CON}" != "pihole" ]
|
if [ "${INPUT_ROCKER_CON}" != "pihole" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving Remote Container Name to ${CONFIG_FILE}"
|
MESSAGE="Saving Remote Container Name to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# ROCKER_CON=''/c\ROCKER_CON='${INPUT_ROCKER_CON}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# ROCKER_CON=''/c\ROCKER_CON='${INPUT_ROCKER_CON}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MESSAGE="Remote Pi-hole 'etc' Volume Path? (Required, no trailing slash)"
|
MESSAGE="Remote Pi-hole 'etc' Volume Path? (Required, no trailing slash)"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_RIHOLE_DIR
|
read INPUT_RIHOLE_DIR
|
||||||
|
|
||||||
if [ "${INPUT_RIHOLE_DIR}" != "" ]
|
if [ "${INPUT_RIHOLE_DIR}" != "" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving Remote Pi-hole Volume to ${CONFIG_FILE}"
|
MESSAGE="Saving Remote Pi-hole Volume to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# RIHOLE_DIR=''/c\RIHOLE_DIR='${INPUT_RIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# RIHOLE_DIR=''/c\RIHOLE_DIR='${INPUT_RIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
SKIP_RIHOLE_DIR="1"
|
SKIP_RIHOLE_DIR="1"
|
||||||
else
|
else
|
||||||
MESSAGE="This setting is required!"
|
MESSAGE="This setting is required!"
|
||||||
echo_warn
|
echo_warn
|
||||||
exit_withchanges
|
exit_withchanges
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MESSAGE="Saving Remote Volume Ownership to ${CONFIG_FILE}"
|
MESSAGE="Saving Remote Volume Ownership to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# RILE_OWNER=''/c\RILE_OWNER='named:docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# RILE_OWNER=''/c\RILE_OWNER='named:docker'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ $SKIP_PIHOLE_DIR != "1" ]
|
if [ $SKIP_PIHOLE_DIR != "1" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Local Pi-hole Settings Directory Path? (Leave blank for default '/etc/pihole')"
|
MESSAGE="Local Pi-hole Settings Directory Path? (Leave blank for default '/etc/pihole')"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_PIHOLE_DIR
|
read INPUT_PIHOLE_DIR
|
||||||
INPUT_PIHOLE_DIR="${INPUT_PIHOLE_DIR:-/etc/pihole}"
|
INPUT_PIHOLE_DIR="${INPUT_PIHOLE_DIR:-/etc/pihole}"
|
||||||
|
|
||||||
if [ "${INPUT_PIHOLE_DIR}" != "/etc/pihole" ]
|
if [ "${INPUT_PIHOLE_DIR}" != "/etc/pihole" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving Local Pi-hole Settings Directory Path to ${CONFIG_FILE}"
|
MESSAGE="Saving Local Pi-hole Settings Directory Path to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# PIHOLE_DIR=''/c\PIHOLE_DIR='${INPUT_PIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# PIHOLE_DIR=''/c\PIHOLE_DIR='${INPUT_PIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$SKIP_RIHOLE_DIR" != "1" ]
|
if [ "$SKIP_RIHOLE_DIR" != "1" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Remote Pi-hole Settings Directory Path? (Leave blank for default '/etc/pihole')"
|
MESSAGE="Remote Pi-hole Settings Directory Path? (Leave blank for default '/etc/pihole')"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_RIHOLE_DIR
|
read INPUT_RIHOLE_DIR
|
||||||
INPUT_RIHOLE_DIR="${INPUT_RIHOLE_DIR:-/etc/pihole}"
|
INPUT_RIHOLE_DIR="${INPUT_RIHOLE_DIR:-/etc/pihole}"
|
||||||
|
|
||||||
if [ "${INPUT_RIHOLE_DIR}" != "/etc/pihole" ]
|
if [ "${INPUT_RIHOLE_DIR}" != "/etc/pihole" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving Remote Pi-hole Settings Directory Path to ${CONFIG_FILE}"
|
MESSAGE="Saving Remote Pi-hole Settings Directory Path to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# RIHOLE_DIR=''/c\RIHOLE_DIR='${INPUT_RIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# RIHOLE_DIR=''/c\RIHOLE_DIR='${INPUT_RIHOLE_DIR}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MESSAGE="Use Custom SSH Port? (Leave blank for default '22')"
|
MESSAGE="Use Custom SSH Port? (Leave blank for default '22')"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_SSH_PORT
|
read INPUT_SSH_PORT
|
||||||
INPUT_SSH_PORT="${INPUT_SSH_PORT:-22}"
|
INPUT_SSH_PORT="${INPUT_SSH_PORT:-22}"
|
||||||
SSH_PORT="${INPUT_SSH_PORT}"
|
SSH_PORT="${INPUT_SSH_PORT}"
|
||||||
|
|
||||||
if [ "${INPUT_SSH_PORT}" != "22" ]
|
if [ "${INPUT_SSH_PORT}" != "22" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving Custom SSH Port to ${CONFIG_FILE}"
|
MESSAGE="Saving Custom SSH Port to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# SSH_PORT=''/c\SSH_PORT='${INPUT_SSH_PORT}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# SSH_PORT=''/c\SSH_PORT='${INPUT_SSH_PORT}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MESSAGE="Enable ICMP Check? (Leave blank for default 'Yes')"
|
MESSAGE="Enable ICMP Check? (Leave blank for default 'Yes')"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_PING_AVOID
|
read INPUT_PING_AVOID
|
||||||
INPUT_PING_AVOID="${INPUT_PING_AVOID:-Y}"
|
INPUT_PING_AVOID="${INPUT_PING_AVOID:-Y}"
|
||||||
|
|
||||||
if [ "${INPUT_PING_AVOID}" != "Y" ]
|
if [ "${INPUT_PING_AVOID}" != "Y" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving ICMP Avoidance to ${CONFIG_FILE}"
|
MESSAGE="Saving ICMP Avoidance to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# PING_AVOID=''/c\PING_AVOID='1'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# PING_AVOID=''/c\PING_AVOID='1'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
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}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# SSH_PKIF=''/c\SSH_PKIF='${INPUT_CUSTOM_PKIF}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# SSH_PKIF=''/c\SSH_PKIF='${INPUT_CUSTOM_PKIF}'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MESSAGE="Enable Replicate 'Local DNS Records' Feature? (Leave blank for default 'Yes')"
|
MESSAGE="Enable Replicate 'Local DNS Records' Feature? (Leave blank for default 'Yes')"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_SKIP_CUSTOM
|
read INPUT_SKIP_CUSTOM
|
||||||
INPUT_SKIP_CUSTOM="${INPUT_SKIP_CUSTOM:-Y}"
|
INPUT_SKIP_CUSTOM="${INPUT_SKIP_CUSTOM:-Y}"
|
||||||
|
|
||||||
if [ "${INPUT_SKIP_CUSTOM}" != "Y" ]
|
if [ "${INPUT_SKIP_CUSTOM}" != "Y" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving Local DNS Preference to ${CONFIG_FILE}"
|
MESSAGE="Saving Local DNS Preference to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# SKIP_CUSTOM=''/c\SKIP_CUSTOM='1'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# SKIP_CUSTOM=''/c\SKIP_CUSTOM='1'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
fi
|
||||||
|
|
||||||
MESSAGE="Change Backup Retention in Days? (Leave blank for default '7')"
|
MESSAGE="Change Backup Retention in Days? (Leave blank for default '7')"
|
||||||
echo_need
|
echo_need
|
||||||
read INPUT_BACKUP_RETAIN
|
read INPUT_BACKUP_RETAIN
|
||||||
INPUT_BACKUP_RETAIN="${INPUT_BACKUP_RETAIN:-7}"
|
INPUT_BACKUP_RETAIN="${INPUT_BACKUP_RETAIN:-7}"
|
||||||
|
|
||||||
if [ "${INPUT_BACKUP_RETAIN}" != "7" ]
|
if [ "${INPUT_BACKUP_RETAIN}" != "7" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Saving Backup Retention to ${CONFIG_FILE}"
|
MESSAGE="Saving Backup Retention to ${CONFIG_FILE}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sed -i "/# BACKUP_RETAIN=''/c\BACKUP_RETAIN='1'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
sed -i "/# BACKUP_RETAIN=''/c\BACKUP_RETAIN='1'" ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
## Delete Existing Configuration
|
## Delete Existing Configuration
|
||||||
function config_delete {
|
function config_delete {
|
||||||
source ${LOCAL_FOLDR}/${CONFIG_FILE}
|
source ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
MESSAGE="Configuration File Exists"
|
MESSAGE="Configuration File Exists"
|
||||||
echo_warn
|
echo_warn
|
||||||
|
|
||||||
echo -e "========================================================"
|
echo -e "========================================================"
|
||||||
cat ${LOCAL_FOLDR}/${CONFIG_FILE}
|
cat ${LOCAL_FOLDR}/${CONFIG_FILE}
|
||||||
echo -e "========================================================"
|
echo -e "========================================================"
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## Detect Docker
|
## Detect Docker
|
||||||
function docker_detect {
|
function docker_detect {
|
||||||
if hash docker 2>/dev/null
|
if hash docker 2>/dev/null
|
||||||
then
|
then
|
||||||
FTLCHECK=$(sudo docker container ls | grep 'pihole/pihole')
|
FTLCHECK=$(sudo docker container ls | grep 'pihole/pihole')
|
||||||
if [ "$FTLCHECK" != "" ]
|
if [ "$FTLCHECK" != "" ]
|
||||||
then
|
then
|
||||||
DOCKERREADY="1"
|
DOCKERREADY="1"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
## Create Bash Alias
|
## Create Bash Alias
|
||||||
function create_alias {
|
function create_alias {
|
||||||
MESSAGE="Creating Bash Alias"
|
MESSAGE="Creating Bash 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
|
||||||
}
|
}
|
||||||
@ -6,87 +6,87 @@
|
|||||||
|
|
||||||
## Import Settings
|
## Import Settings
|
||||||
function import_gs {
|
function import_gs {
|
||||||
MESSAGE="Importing ${CONFIG_FILE} Settings"
|
MESSAGE="Importing ${CONFIG_FILE} Settings"
|
||||||
echo -en "${STAT} $MESSAGE"
|
echo -en "${STAT} $MESSAGE"
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## Invalid Tasks
|
## Invalid Tasks
|
||||||
function task_invalid {
|
function task_invalid {
|
||||||
echo_fail
|
echo_fail
|
||||||
list_gs_arguments
|
list_gs_arguments
|
||||||
}
|
}
|
||||||
|
|
||||||
## Error Validation
|
## Error Validation
|
||||||
function error_validate {
|
function error_validate {
|
||||||
if [ "$?" != "0" ]
|
if [ "$?" != "0" ]
|
||||||
then
|
then
|
||||||
echo_fail
|
echo_fail
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
echo_good
|
echo_good
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function ph_type {
|
function ph_type {
|
||||||
if [ "$PH_IN_TYPE" == "default" ]
|
if [ "$PH_IN_TYPE" == "default" ]
|
||||||
then
|
then
|
||||||
PH_EXEC="${PIHOLE_BIN}"
|
PH_EXEC="${PIHOLE_BIN}"
|
||||||
elif [ "$PH_IN_TYPE" == "docker" ]
|
elif [ "$PH_IN_TYPE" == "docker" ]
|
||||||
then
|
then
|
||||||
PH_EXEC="${DOCKER_BIN} exec ${DOCKER_CON} pihole"
|
PH_EXEC="${DOCKER_BIN} exec ${DOCKER_CON} pihole"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$RH_IN_TYPE" == "default" ]
|
if [ "$RH_IN_TYPE" == "default" ]
|
||||||
then
|
then
|
||||||
RH_EXEC="${RIHOLE_BIN}"
|
RH_EXEC="${RIHOLE_BIN}"
|
||||||
elif [ "$RH_IN_TYPE" == "docker" ]
|
elif [ "$RH_IN_TYPE" == "docker" ]
|
||||||
then
|
then
|
||||||
RH_EXEC="${ROCKER_BIN} exec ${DOCKER_CON} pihole"
|
RH_EXEC="${ROCKER_BIN} exec ${DOCKER_CON} pihole"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Standard Output
|
# Standard Output
|
||||||
function start_gs {
|
function start_gs {
|
||||||
MESSAGE="${PROGRAM} ${VERSION} Executing"
|
MESSAGE="${PROGRAM} ${VERSION} Executing"
|
||||||
echo_info
|
echo_info
|
||||||
cd ${LOCAL_FOLDR}
|
cd ${LOCAL_FOLDR}
|
||||||
|
|
||||||
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
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Standard Output No Config
|
# Standard Output No Config
|
||||||
function start_gs_noconfig {
|
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
|
||||||
}
|
}
|
||||||
@ -6,43 +6,43 @@
|
|||||||
|
|
||||||
## No Changes Made
|
## No Changes Made
|
||||||
function exit_nochange {
|
function exit_nochange {
|
||||||
SCRIPT_END=$SECONDS
|
SCRIPT_END=$SECONDS
|
||||||
MESSAGE="${PROGRAM} ${TASKTYPE} Aborting ($((SCRIPT_END-SCRIPT_START)) seconds)"
|
MESSAGE="${PROGRAM} ${TASKTYPE} Aborting ($((SCRIPT_END-SCRIPT_START)) seconds)"
|
||||||
echo_info
|
echo_info
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
## Changes Made
|
## Changes Made
|
||||||
function exit_withchange {
|
function exit_withchange {
|
||||||
SCRIPT_END=$SECONDS
|
SCRIPT_END=$SECONDS
|
||||||
MESSAGE="${PROGRAM} ${TASKTYPE} Completed ($((SCRIPT_END-SCRIPT_START)) seconds)"
|
MESSAGE="${PROGRAM} ${TASKTYPE} Completed ($((SCRIPT_END-SCRIPT_START)) seconds)"
|
||||||
echo_info
|
echo_info
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
## List GS Arguments
|
## List GS Arguments
|
||||||
function list_gs_arguments {
|
function list_gs_arguments {
|
||||||
echo -e "Usage: $0 [options]"
|
echo -e "Usage: $0 [options]"
|
||||||
echo -e "Example: '$0 pull'"
|
echo -e "Example: '$0 pull'"
|
||||||
echo -e ""
|
echo -e ""
|
||||||
echo -e "Setup Options:"
|
echo -e "Setup Options:"
|
||||||
echo -e " ${YELLOW}config${NC} Create a new ${CONFIG_FILE} file"
|
echo -e " ${YELLOW}config${NC} Create a new ${CONFIG_FILE} file"
|
||||||
echo -e " ${YELLOW}automate${NC} Add a scheduled pull task to crontab"
|
echo -e " ${YELLOW}automate${NC} Add a scheduled pull task to crontab"
|
||||||
echo -e " ${YELLOW}update${NC} Update ${PROGRAM} to the latest version"
|
echo -e " ${YELLOW}update${NC} Update ${PROGRAM} to the latest version"
|
||||||
echo -e " ${YELLOW}version${NC} Display installed version of ${PROGRAM}"
|
echo -e " ${YELLOW}version${NC} Display installed version of ${PROGRAM}"
|
||||||
echo -e " ${YELLOW}sudo${NC} Configure passwordless sudo for current user"
|
echo -e " ${YELLOW}sudo${NC} Configure passwordless sudo for current user"
|
||||||
echo -e ""
|
echo -e ""
|
||||||
echo -e "Replication Options:"
|
echo -e "Replication Options:"
|
||||||
echo -e " ${YELLOW}smart${NC} Detect changes on each side and bring them together"
|
echo -e " ${YELLOW}smart${NC} Detect changes on each side and bring them together"
|
||||||
echo -e " ${YELLOW}pull${NC} Force remote configuration changes to this server"
|
echo -e " ${YELLOW}pull${NC} Force remote configuration changes to this server"
|
||||||
echo -e " ${YELLOW}push${NC} Force local configuration made on this server back"
|
echo -e " ${YELLOW}push${NC} Force local configuration made on this server back"
|
||||||
echo -e " ${YELLOW}restore${NC} Restore the ${GRAVITY_FI} on this server"
|
echo -e " ${YELLOW}restore${NC} Restore the ${GRAVITY_FI} on this server"
|
||||||
echo -e " ${YELLOW}backup${NC} Backup the ${GRAVITY_FI} on this server"
|
echo -e " ${YELLOW}backup${NC} Backup the ${GRAVITY_FI} on this server"
|
||||||
echo -e " ${YELLOW}compare${NC} Just check for differences"
|
echo -e " ${YELLOW}compare${NC} Just check for differences"
|
||||||
echo -e ""
|
echo -e ""
|
||||||
echo -e "Debug Options:"
|
echo -e "Debug Options:"
|
||||||
echo -e " ${YELLOW}logs${NC} Show recent successful replication jobs"
|
echo -e " ${YELLOW}logs${NC} Show recent successful replication jobs"
|
||||||
echo -e " ${YELLOW}cron${NC} Display output of last crontab execution"
|
echo -e " ${YELLOW}cron${NC} Display output of last crontab execution"
|
||||||
echo -e ""
|
echo -e ""
|
||||||
exit_nochange
|
exit_nochange
|
||||||
}
|
}
|
||||||
@ -6,143 +6,143 @@
|
|||||||
|
|
||||||
## 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
|
||||||
HASHMARK=$((HASHMARK+0))
|
HASHMARK=$((HASHMARK+0))
|
||||||
else
|
else
|
||||||
MESSAGE="Differenced ${GRAVITY_FI} Detected"
|
MESSAGE="Differenced ${GRAVITY_FI} Detected"
|
||||||
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} ]
|
||||||
then
|
then
|
||||||
if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${RIHOLE_DIR}/${CUSTOM_DNS}
|
if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${RIHOLE_DIR}/${CUSTOM_DNS}
|
||||||
then
|
then
|
||||||
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
|
||||||
HASHMARK=$((HASHMARK+0))
|
HASHMARK=$((HASHMARK+0))
|
||||||
else
|
else
|
||||||
MESSAGE="Differenced ${CUSTOM_DNS} Detected"
|
MESSAGE="Differenced ${CUSTOM_DNS} Detected"
|
||||||
echo_warn
|
echo_warn
|
||||||
HASHMARK=$((HASHMARK+1))
|
HASHMARK=$((HASHMARK+1))
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
MESSAGE="No ${CUSTOM_DNS} Detected on ${REMOTE_HOST}"
|
MESSAGE="No ${CUSTOM_DNS} Detected on ${REMOTE_HOST}"
|
||||||
echo_info
|
echo_info
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${RIHOLE_DIR}/${CUSTOM_DNS}
|
if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${RIHOLE_DIR}/${CUSTOM_DNS}
|
||||||
then
|
then
|
||||||
REMOTE_CUSTOM_DNS="1"
|
REMOTE_CUSTOM_DNS="1"
|
||||||
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"
|
||||||
echo_warn
|
echo_warn
|
||||||
HASHMARK=$((HASHMARK+0))
|
HASHMARK=$((HASHMARK+0))
|
||||||
else
|
else
|
||||||
MESSAGE="No Replication Required"
|
MESSAGE="No Replication Required"
|
||||||
echo_info
|
echo_info
|
||||||
exit_nochange
|
exit_nochange
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function previous_md5 {
|
function previous_md5 {
|
||||||
if [ -f "${LOG_PATH}/${HISTORY_MD5}" ]
|
if [ -f "${LOG_PATH}/${HISTORY_MD5}" ]
|
||||||
then
|
then
|
||||||
last_primaryDBMD5=$(sed "1q;d" ${LOG_PATH}/${HISTORY_MD5})
|
last_primaryDBMD5=$(sed "1q;d" ${LOG_PATH}/${HISTORY_MD5})
|
||||||
last_secondDBMD5=$(sed "2q;d" ${LOG_PATH}/${HISTORY_MD5})
|
last_secondDBMD5=$(sed "2q;d" ${LOG_PATH}/${HISTORY_MD5})
|
||||||
last_primaryCLMD5=$(sed "3q;d" ${LOG_PATH}/${HISTORY_MD5})
|
last_primaryCLMD5=$(sed "3q;d" ${LOG_PATH}/${HISTORY_MD5})
|
||||||
last_secondCLMD5=$(sed "4q;d" ${LOG_PATH}/${HISTORY_MD5})
|
last_secondCLMD5=$(sed "4q;d" ${LOG_PATH}/${HISTORY_MD5})
|
||||||
else
|
else
|
||||||
last_primaryDBMD5="0"
|
last_primaryDBMD5="0"
|
||||||
last_secondDBMD5="0"
|
last_secondDBMD5="0"
|
||||||
last_primaryCLMD5="0"
|
last_primaryCLMD5="0"
|
||||||
last_secondCLMD5="0"
|
last_secondCLMD5="0"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function md5_recheck {
|
function md5_recheck {
|
||||||
MESSAGE="Performing Replicator Diagnostics"
|
MESSAGE="Performing Replicator Diagnostics"
|
||||||
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} ]
|
||||||
then
|
then
|
||||||
if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${RIHOLE_DIR}/${CUSTOM_DNS}
|
if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${RIHOLE_DIR}/${CUSTOM_DNS}
|
||||||
then
|
then
|
||||||
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
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${RIHOLE_DIR}/${CUSTOM_DNS}
|
if ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} test -e ${RIHOLE_DIR}/${CUSTOM_DNS}
|
||||||
then
|
then
|
||||||
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
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@ -6,36 +6,36 @@
|
|||||||
|
|
||||||
## Validate Intent
|
## Validate Intent
|
||||||
function intent_validate {
|
function intent_validate {
|
||||||
if [ "$VERIFY_PASS" == "0" ]
|
if [ "$VERIFY_PASS" == "0" ]
|
||||||
then
|
then
|
||||||
PHASER=$((( RANDOM % 4 ) + 1 ))
|
PHASER=$((( RANDOM % 4 ) + 1 ))
|
||||||
if [ "$PHASER" = "1" ]
|
if [ "$PHASER" = "1" ]
|
||||||
then
|
then
|
||||||
INTENT="FIRE PHOTON TORPEDOS"
|
INTENT="FIRE PHOTON TORPEDOS"
|
||||||
elif [ "$PHASER" = "2" ]
|
elif [ "$PHASER" = "2" ]
|
||||||
then
|
then
|
||||||
INTENT="FIRE ALL PHASERS"
|
INTENT="FIRE ALL PHASERS"
|
||||||
elif [ "$PHASER" = "3" ]
|
elif [ "$PHASER" = "3" ]
|
||||||
then
|
then
|
||||||
INTENT="EJECT THE WARPCORE"
|
INTENT="EJECT THE WARPCORE"
|
||||||
elif [ "$PHASER" = "4" ]
|
elif [ "$PHASER" = "4" ]
|
||||||
then
|
then
|
||||||
INTENT="ENGAGE TRACTOR BEAM"
|
INTENT="ENGAGE TRACTOR BEAM"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
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"
|
||||||
echo_info
|
echo_info
|
||||||
exit_nochange
|
exit_nochange
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
MESSAGE="Verification Bypassed"
|
MESSAGE="Verification Bypassed"
|
||||||
echo_warn
|
echo_warn
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@ -6,89 +6,89 @@
|
|||||||
|
|
||||||
## Logs Task
|
## Logs Task
|
||||||
function task_logs {
|
function task_logs {
|
||||||
TASKTYPE='LOGS'
|
TASKTYPE='LOGS'
|
||||||
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
|
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
|
||||||
echo_good
|
echo_good
|
||||||
|
|
||||||
logs_gs
|
logs_gs
|
||||||
}
|
}
|
||||||
|
|
||||||
## Core Logging
|
## Core Logging
|
||||||
### Write Logs Out
|
### Write Logs Out
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## Crontab Logs
|
## Crontab Logs
|
||||||
### Core Crontab Logs
|
### Core Crontab Logs
|
||||||
function show_crontab {
|
function show_crontab {
|
||||||
MESSAGE="Replaying Last Cronjob"
|
MESSAGE="Replaying Last Cronjob"
|
||||||
echo_stat
|
echo_stat
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,165 +23,165 @@ function task_pull {
|
|||||||
## 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}')
|
GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk 'OFS=":" {print $3,$4}')
|
||||||
if [ "$GRAVDB_OWN" != "$FILE_OWNER" ]
|
if [ "$GRAVDB_OWN" != "$FILE_OWNER" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Validating Ownership 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 Ownership on ${GRAVITY_FI}"
|
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sudo chown ${FILE_OWNER} ${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
|
else
|
||||||
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
|
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sudo chown ${FILE_OWNER} ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
|
sudo chown ${FILE_OWNER} ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
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
|
||||||
MESSAGE="Validating Permissions on ${GRAVITY_FI}"
|
MESSAGE="Validating Permissions 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 Permissions on ${GRAVITY_FI}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sudo chmod 664 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
|
sudo chmod 664 ${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
|
||||||
|
|
||||||
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}')
|
CUSTOMLS_OWN=$(ls -ld ${PIHOLE_DIR}/${CUSTOM_DNS} | awk '{print $3 $4}')
|
||||||
if [ "$CUSTOMLS_OWN" != "rootroot" ]
|
if [ "$CUSTOMLS_OWN" != "rootroot" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Validating Ownership on ${CUSTOM_DNS}"
|
MESSAGE="Validating Ownership on ${CUSTOM_DNS}"
|
||||||
echo_fail
|
echo_fail
|
||||||
|
|
||||||
MESSAGE="Attempting to Compensate"
|
MESSAGE="Attempting to Compensate"
|
||||||
echo_warn
|
echo_warn
|
||||||
|
|
||||||
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
|
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sudo chown root:root ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
|
sudo chown root:root ${PIHOLE_DIR}/${CUSTOM_DNS} >/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
|
||||||
|
|
||||||
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
|
||||||
MESSAGE="Validating Permissions on ${CUSTOM_DNS}"
|
MESSAGE="Validating Permissions on ${CUSTOM_DNS}"
|
||||||
echo_fail
|
echo_fail
|
||||||
|
|
||||||
MESSAGE="Attempting to Compensate"
|
MESSAGE="Attempting to Compensate"
|
||||||
echo_warn
|
echo_warn
|
||||||
|
|
||||||
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
|
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sudo chmod 644 ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
|
sudo chmod 644 ${PIHOLE_DIR}/${CUSTOM_DNS} >/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
|
||||||
|
|
||||||
echo_good
|
echo_good
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
## Pull Reload
|
## Pull Reload
|
||||||
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
|
||||||
function pull_gs {
|
function pull_gs {
|
||||||
previous_md5
|
previous_md5
|
||||||
md5_compare
|
md5_compare
|
||||||
|
|
||||||
backup_settime
|
backup_settime
|
||||||
pull_gs_grav
|
pull_gs_grav
|
||||||
pull_gs_cust
|
pull_gs_cust
|
||||||
pull_gs_reload
|
pull_gs_reload
|
||||||
md5_recheck
|
md5_recheck
|
||||||
|
|
||||||
logs_export
|
logs_export
|
||||||
exit_withchange
|
exit_withchange
|
||||||
}
|
}
|
||||||
@ -6,73 +6,73 @@
|
|||||||
|
|
||||||
## Purge Task
|
## Purge Task
|
||||||
function task_purge {
|
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:"
|
||||||
echo_warn
|
echo_warn
|
||||||
MESSAGE="- All backups files."
|
MESSAGE="- All backups files."
|
||||||
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."
|
||||||
elif [ -f "${LOCAL_FOLDR}/beta" ]
|
elif [ -f "${LOCAL_FOLDR}/beta" ]
|
||||||
then
|
then
|
||||||
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."
|
||||||
echo_warn
|
echo_warn
|
||||||
MESSAGE="- Associated SSH id_rsa keys."
|
MESSAGE="- Associated SSH id_rsa keys."
|
||||||
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,"
|
||||||
echo_info
|
echo_info
|
||||||
MESSAGE="but your ${GRAVITY_FI} and ${CUSTOM_DNS} WILL NOT sync anymore,"
|
MESSAGE="but your ${GRAVITY_FI} and ${CUSTOM_DNS} WILL NOT sync anymore,"
|
||||||
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
|
||||||
}
|
}
|
||||||
@ -22,106 +22,106 @@ function task_push {
|
|||||||
|
|
||||||
## Push Gravity
|
## Push Gravity
|
||||||
function push_gs_grav {
|
function push_gs_grav {
|
||||||
backup_remote_gravity
|
backup_remote_gravity
|
||||||
backup_local_gravity
|
backup_local_gravity
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## Push Reload
|
## Push Reload
|
||||||
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
|
||||||
function push_gs {
|
function push_gs {
|
||||||
previous_md5
|
previous_md5
|
||||||
md5_compare
|
md5_compare
|
||||||
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
|
||||||
}
|
}
|
||||||
@ -21,176 +21,176 @@ function task_restore {
|
|||||||
|
|
||||||
## Restore Gravity
|
## Restore Gravity
|
||||||
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}')
|
GRAVDB_OWN=$(ls -ld ${PIHOLE_DIR}/${GRAVITY_FI} | awk 'OFS=":" {print $3,$4}')
|
||||||
if [ "$GRAVDB_OWN" == "$FILE_OWNER" ]
|
if [ "$GRAVDB_OWN" == "$FILE_OWNER" ]
|
||||||
then
|
then
|
||||||
echo_good
|
echo_good
|
||||||
else
|
else
|
||||||
echo_fail
|
echo_fail
|
||||||
|
|
||||||
MESSAGE="Attempting to Compensate"
|
MESSAGE="Attempting to Compensate"
|
||||||
echo_warn
|
echo_warn
|
||||||
|
|
||||||
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
|
MESSAGE="Setting Ownership on ${GRAVITY_FI}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sudo chown ${FILE_OWNER} ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
|
sudo chown ${FILE_OWNER} ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
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"
|
MESSAGE="Attempting to Compensate"
|
||||||
echo_warn
|
echo_warn
|
||||||
|
|
||||||
MESSAGE="Setting Ownership 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 chmod 664 ${PIHOLE_DIR}/${GRAVITY_FI} >/dev/null 2>&1
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
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}')
|
CUSTOMLS_OWN=$(ls -ld ${PIHOLE_DIR}/${CUSTOM_DNS} | awk '{print $3 $4}')
|
||||||
if [ "$CUSTOMLS_OWN" == "rootroot" ]
|
if [ "$CUSTOMLS_OWN" == "rootroot" ]
|
||||||
then
|
then
|
||||||
echo_good
|
echo_good
|
||||||
else
|
else
|
||||||
echo_fail
|
echo_fail
|
||||||
|
|
||||||
MESSAGE="Attempting to Compensate"
|
MESSAGE="Attempting to Compensate"
|
||||||
echo_warn
|
echo_warn
|
||||||
|
|
||||||
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
|
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sudo chown root:root ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
|
sudo chown root:root ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
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"
|
MESSAGE="Attempting to Compensate"
|
||||||
echo_warn
|
echo_warn
|
||||||
|
|
||||||
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
|
MESSAGE="Setting Ownership on ${CUSTOM_DNS}"
|
||||||
echo_stat
|
echo_stat
|
||||||
sudo chmod 644 ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
|
sudo chmod 644 ${PIHOLE_DIR}/${CUSTOM_DNS} >/dev/null 2>&1
|
||||||
error_validate
|
error_validate
|
||||||
fi
|
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
|
||||||
elif [ "${PUSH_TO_PRIMARY}" == "No" ] || [ "${PUSH_TO_PRIMARY}" == "no" ] || [ "${PUSH_TO_PRIMARY}" == "N" ] || [ "${PUSH_TO_PRIMARY}" == "n" ]
|
elif [ "${PUSH_TO_PRIMARY}" == "No" ] || [ "${PUSH_TO_PRIMARY}" == "no" ] || [ "${PUSH_TO_PRIMARY}" == "N" ] || [ "${PUSH_TO_PRIMARY}" == "n" ]
|
||||||
then
|
then
|
||||||
logs_export
|
logs_export
|
||||||
exit_withchange
|
exit_withchange
|
||||||
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
|
||||||
}
|
}
|
||||||
@ -6,66 +6,66 @@
|
|||||||
|
|
||||||
## Sudo Creation Task
|
## Sudo Creation Task
|
||||||
function task_sudo {
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## 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
|
||||||
|
|
||||||
exit_nochange
|
exit_nochange
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function new_root_check {
|
function new_root_check {
|
||||||
CURRENTUSER=$(whoami)
|
CURRENTUSER=$(whoami)
|
||||||
if [ ! "$EUID" -ne 0 ]
|
if [ ! "$EUID" -ne 0 ]
|
||||||
then
|
then
|
||||||
LOCALADMIN=""
|
LOCALADMIN=""
|
||||||
else
|
else
|
||||||
# Check Sudo
|
# Check Sudo
|
||||||
SUDOCHECK=$(groups ${CURRENTUSER} | grep -e 'sudo' -e 'wheel')
|
SUDOCHECK=$(groups ${CURRENTUSER} | grep -e 'sudo' -e 'wheel')
|
||||||
if [ "$SUDOCHECK" == "" ]
|
if [ "$SUDOCHECK" == "" ]
|
||||||
then
|
then
|
||||||
LOCALADMIN="nosudo"
|
LOCALADMIN="nosudo"
|
||||||
else
|
else
|
||||||
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
|
||||||
}
|
}
|
||||||
@ -7,8 +7,8 @@
|
|||||||
## Smart Task
|
## Smart Task
|
||||||
function task_smart {
|
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
|
||||||
@ -22,135 +22,135 @@ function task_smart {
|
|||||||
|
|
||||||
## Smart Sync Function
|
## Smart Sync Function
|
||||||
function smart_gs {
|
function smart_gs {
|
||||||
MESSAGE="Starting ${TASKTYPE} Analysis"
|
MESSAGE="Starting ${TASKTYPE} Analysis"
|
||||||
echo_info
|
echo_info
|
||||||
|
|
||||||
previous_md5
|
previous_md5
|
||||||
md5_compare
|
md5_compare
|
||||||
backup_settime
|
backup_settime
|
||||||
|
|
||||||
PRIDBCHANGE="0"
|
PRIDBCHANGE="0"
|
||||||
SECDBCHANGE="0"
|
SECDBCHANGE="0"
|
||||||
PRICLCHANGE="0"
|
PRICLCHANGE="0"
|
||||||
SECCLCHANGE="0"
|
SECCLCHANGE="0"
|
||||||
|
|
||||||
if [ "${primaryDBMD5}" != "${last_primaryDBMD5}" ]
|
if [ "${primaryDBMD5}" != "${last_primaryDBMD5}" ]
|
||||||
then
|
then
|
||||||
PRIDBCHANGE="1"
|
PRIDBCHANGE="1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${secondDBMD5}" != "${last_secondDBMD5}" ]
|
if [ "${secondDBMD5}" != "${last_secondDBMD5}" ]
|
||||||
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" ]
|
||||||
then
|
then
|
||||||
pull_gs_grav
|
pull_gs_grav
|
||||||
PULLRESTART="1"
|
PULLRESTART="1"
|
||||||
elif [ "${SECDBCHANGE}" != "0" ]
|
elif [ "${SECDBCHANGE}" != "0" ]
|
||||||
then
|
then
|
||||||
push_gs_grav
|
push_gs_grav
|
||||||
PUSHRESTART="1"
|
PUSHRESTART="1"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${primaryCLMD5}" != "${last_primaryCLMD5}" ]
|
if [ "${primaryCLMD5}" != "${last_primaryCLMD5}" ]
|
||||||
then
|
then
|
||||||
PRICLCHANGE="1"
|
PRICLCHANGE="1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${secondCLMD5}" != "${last_secondCLMD5}" ]
|
if [ "${secondCLMD5}" != "${last_secondCLMD5}" ]
|
||||||
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" ]
|
||||||
then
|
then
|
||||||
pull_gs_cust
|
pull_gs_cust
|
||||||
PULLRESTART="1"
|
PULLRESTART="1"
|
||||||
elif [ "${SECCLCHANGE}" != "0" ]
|
elif [ "${SECCLCHANGE}" != "0" ]
|
||||||
then
|
then
|
||||||
push_gs_cust
|
push_gs_cust
|
||||||
PUSHRESTART="1"
|
PUSHRESTART="1"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
pull_gs_cust
|
pull_gs_cust
|
||||||
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
|
||||||
}
|
}
|
||||||
@ -6,180 +6,180 @@
|
|||||||
|
|
||||||
## Determine SSH Pathways
|
## Determine SSH Pathways
|
||||||
function create_sshcmd {
|
function create_sshcmd {
|
||||||
# if hash ssh 2>/dev/null
|
# if hash ssh 2>/dev/null
|
||||||
# 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
|
||||||
# fi
|
# fi
|
||||||
# fi
|
# fi
|
||||||
}
|
}
|
||||||
|
|
||||||
## Determine SSH Pathways
|
## Determine SSH Pathways
|
||||||
function create_rsynccmd {
|
function create_rsynccmd {
|
||||||
# if hash ssh 2>/dev/null
|
# if hash ssh 2>/dev/null
|
||||||
# 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
|
||||||
# fi
|
# fi
|
||||||
# fi
|
# fi
|
||||||
}
|
}
|
||||||
|
|
||||||
## 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
|
||||||
echo_good
|
echo_good
|
||||||
else
|
else
|
||||||
echo_fail
|
echo_fail
|
||||||
MESSAGE="SSH-KEYGEN is Required"
|
MESSAGE="SSH-KEYGEN is Required"
|
||||||
echo_info
|
echo_info
|
||||||
|
|
||||||
exit_nochange
|
exit_nochange
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function generate_sshkey {
|
function generate_sshkey {
|
||||||
if [ -z $INPUT_REMOTE_PASS ]
|
if [ -z $INPUT_REMOTE_PASS ]
|
||||||
then
|
then
|
||||||
if [ -f $HOME/${SSH_PKIF} ]
|
if [ -f $HOME/${SSH_PKIF} ]
|
||||||
then
|
then
|
||||||
MESSAGE="Using Existing ~/${SSH_PKIF}"
|
MESSAGE="Using Existing ~/${SSH_PKIF}"
|
||||||
echo_info
|
echo_info
|
||||||
else
|
else
|
||||||
if hash ssh-keygen >/dev/null 2>&1
|
if hash ssh-keygen >/dev/null 2>&1
|
||||||
then
|
then
|
||||||
MESSAGE="Generating ~/${SSH_PKIF} (SSH-KEYGEN)"
|
MESSAGE="Generating ~/${SSH_PKIF} (SSH-KEYGEN)"
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
function export_sshkey {
|
function export_sshkey {
|
||||||
if [ -z $REMOTE_PASS ]
|
if [ -z $REMOTE_PASS ]
|
||||||
then
|
then
|
||||||
if [ -f $HOME/${SSH_PKIF} ]
|
if [ -f $HOME/${SSH_PKIF} ]
|
||||||
then
|
then
|
||||||
MESSAGE="Registering Key-Pair on ${REMOTE_HOST}"
|
MESSAGE="Registering Key-Pair on ${REMOTE_HOST}"
|
||||||
echo_info
|
echo_info
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## Detect SSH & RSYNC
|
## Detect SSH & RSYNC
|
||||||
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)"
|
||||||
echo_good
|
echo_good
|
||||||
SSH_CMD='ssh'
|
SSH_CMD='ssh'
|
||||||
elif hash dbclient 2>/dev/null
|
elif hash dbclient 2>/dev/null
|
||||||
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
|
||||||
|
|
||||||
MESSAGE="Attempting to Compensate"
|
MESSAGE="Attempting to Compensate"
|
||||||
echo_warn
|
echo_warn
|
||||||
MESSAGE="Installing SSH Client with ${PKG_MANAGER}"
|
MESSAGE="Installing SSH Client with ${PKG_MANAGER}"
|
||||||
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
|
||||||
else
|
else
|
||||||
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
|
||||||
}
|
}
|
||||||
@ -6,174 +6,174 @@
|
|||||||
|
|
||||||
## Master Branch
|
## Master Branch
|
||||||
function update_gs {
|
function update_gs {
|
||||||
if [ -f "${LOCAL_FOLDR}/dev" ]
|
if [ -f "${LOCAL_FOLDR}/dev" ]
|
||||||
then
|
then
|
||||||
source ${LOCAL_FOLDR}/dev
|
source ${LOCAL_FOLDR}/dev
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## Show Version
|
## Show Version
|
||||||
function show_version {
|
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=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
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
|
||||||
MESSAGE="Latest Version: ${RED}Unknown${NC}"
|
MESSAGE="Latest Version: ${RED}Unknown${NC}"
|
||||||
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
|
||||||
echo -e "========================================================"
|
echo -e "========================================================"
|
||||||
}
|
}
|
||||||
|
|
||||||
function show_info() {
|
function show_info() {
|
||||||
echo -e "========================================================"
|
echo -e "========================================================"
|
||||||
echo -e "${YELLOW}Local Pi-hole Settings${NC}"
|
echo -e "${YELLOW}Local Pi-hole Settings${NC}"
|
||||||
echo -e "Local Pi-hole Type: ${PH_IN_TYPE}"
|
echo -e "Local Pi-hole Type: ${PH_IN_TYPE}"
|
||||||
echo -e "Local Pi-hole Config Directory: ${PIHOLE_DIR}"
|
echo -e "Local Pi-hole Config Directory: ${PIHOLE_DIR}"
|
||||||
echo -e "Local Pi-hole Binary Directory: ${PIHOLE_BIN}"
|
echo -e "Local Pi-hole Binary Directory: ${PIHOLE_BIN}"
|
||||||
echo -e "Local Docker Binary Directory: ${DOCKER_BIN}"
|
echo -e "Local Docker Binary Directory: ${DOCKER_BIN}"
|
||||||
echo -e "Local File Owner Settings: ${DOCKER_BIN}"
|
echo -e "Local File Owner Settings: ${DOCKER_BIN}"
|
||||||
echo -e "Local Docker Container Name: ${DOCKER_CON}"
|
echo -e "Local Docker Container Name: ${DOCKER_CON}"
|
||||||
echo -e ""
|
echo -e ""
|
||||||
echo -e "${YELLOW}Remote Pi-hole Settings${NC}"
|
echo -e "${YELLOW}Remote Pi-hole Settings${NC}"
|
||||||
echo -e "Remote Pi-hole Type: ${RH_IN_TYPE}"
|
echo -e "Remote Pi-hole Type: ${RH_IN_TYPE}"
|
||||||
echo -e "Remote Pi-hole Config Directory: ${RIHOLE_DIR}"
|
echo -e "Remote Pi-hole Config Directory: ${RIHOLE_DIR}"
|
||||||
echo -e "Remote Pi-hole Binary Directory: ${RIHOLE_BIN}"
|
echo -e "Remote Pi-hole Binary Directory: ${RIHOLE_BIN}"
|
||||||
echo -e "Remote Docker Binary Directory: ${DOCKER_BIN}"
|
echo -e "Remote Docker Binary Directory: ${DOCKER_BIN}"
|
||||||
echo -e "Remote File Owner Settings: ${DOCKER_BIN}"
|
echo -e "Remote File Owner Settings: ${DOCKER_BIN}"
|
||||||
echo -e "Remote Docker Container Name: ${DOCKER_CON}"
|
echo -e "Remote Docker Container Name: ${DOCKER_CON}"
|
||||||
echo -e "========================================================"
|
echo -e "========================================================"
|
||||||
}
|
}
|
||||||
|
|
||||||
## Devmode Task
|
## Devmode Task
|
||||||
function task_devmode {
|
function task_devmode {
|
||||||
TASKTYPE='DEV'
|
TASKTYPE='DEV'
|
||||||
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
|
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
|
||||||
echo_good
|
echo_good
|
||||||
|
|
||||||
if [ -f ${LOCAL_FOLDR}/dev ]
|
if [ -f ${LOCAL_FOLDR}/dev ]
|
||||||
then
|
then
|
||||||
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
|
||||||
|
|
||||||
update_gs
|
update_gs
|
||||||
|
|
||||||
exit_withchange
|
exit_withchange
|
||||||
}
|
}
|
||||||
|
|
||||||
## Update Task
|
## Update Task
|
||||||
function task_update {
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## Version Task
|
## Version Task
|
||||||
function task_version {
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## Info Task
|
## Info Task
|
||||||
|
|
||||||
function task_info() {
|
function task_info() {
|
||||||
TASKTYPE='INFO'
|
TASKTYPE='INFO'
|
||||||
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
|
MESSAGE="${MESSAGE}: ${TASKTYPE} Requested"
|
||||||
echo_good
|
echo_good
|
||||||
|
|
||||||
show_info
|
show_info
|
||||||
|
|
||||||
exit_nochange
|
exit_nochange
|
||||||
}
|
}
|
||||||
@ -6,156 +6,156 @@
|
|||||||
|
|
||||||
## Validate GS Folders
|
## Validate GS Folders
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
## Validate Pi-hole Folders
|
## Validate Pi-hole Folders
|
||||||
function validate_ph_folders {
|
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
|
then
|
||||||
if [ ! -f ${PIHOLE_BIN} ]
|
if [ ! -f ${PIHOLE_BIN} ]
|
||||||
then
|
then
|
||||||
MESSAGE="Unable to Validate that Pi-Hole is Installed"
|
MESSAGE="Unable to Validate that Pi-Hole is Installed"
|
||||||
echo_fail
|
echo_fail
|
||||||
exit_nochange
|
exit_nochange
|
||||||
fi
|
fi
|
||||||
elif [ "$PH_IN_TYPE" == "docker" ]
|
elif [ "$PH_IN_TYPE" == "docker" ]
|
||||||
then
|
then
|
||||||
FTLCHECK=$(sudo docker container ls | grep 'pihole/pihole')
|
FTLCHECK=$(sudo docker container ls | grep 'pihole/pihole')
|
||||||
if [ "$FTLCHECK" == "" ]
|
if [ "$FTLCHECK" == "" ]
|
||||||
then
|
then
|
||||||
MESSAGE="Unable to Validate that Pi-Hole is Installed"
|
MESSAGE="Unable to Validate that Pi-Hole is Installed"
|
||||||
echo_fail
|
echo_fail
|
||||||
exit_nochange
|
exit_nochange
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d ${PIHOLE_DIR} ]
|
if [ ! -d ${PIHOLE_DIR} ]
|
||||||
then
|
then
|
||||||
MESSAGE="Unable to Validate Pi-Hole Configuration Directory"
|
MESSAGE="Unable to Validate Pi-Hole Configuration Directory"
|
||||||
echo_fail
|
echo_fail
|
||||||
exit_nochange
|
exit_nochange
|
||||||
fi
|
fi
|
||||||
echo_good
|
echo_good
|
||||||
}
|
}
|
||||||
|
|
||||||
## Validate SQLite3
|
## Validate SQLite3
|
||||||
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"
|
||||||
# echo_warn
|
# echo_warn
|
||||||
# if [ -z "$REMOTE_PASS" ]
|
# if [ -z "$REMOTE_PASS" ]
|
||||||
# then
|
# then
|
||||||
# MESSAGE="Using SSH Key-Pair Authentication"
|
# MESSAGE="Using SSH Key-Pair Authentication"
|
||||||
# echo_info
|
# echo_info
|
||||||
# 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
|
||||||
# SSHPASSWORD="sshpass -p ${REMOTE_PASS}"
|
# SSHPASSWORD="sshpass -p ${REMOTE_PASS}"
|
||||||
# MESSAGE="Using SSH Password Authentication"
|
# MESSAGE="Using SSH Password Authentication"
|
||||||
# echo_warn
|
# echo_warn
|
||||||
# else
|
# else
|
||||||
# MESSAGE="Valid Key-Pair Detected ${NC}(${RED}Password Ignored${NC})"
|
# MESSAGE="Valid Key-Pair Detected ${NC}(${RED}Password Ignored${NC})"
|
||||||
# echo_info
|
# echo_info
|
||||||
# fi
|
# fi
|
||||||
# fi
|
# fi
|
||||||
# else
|
# else
|
||||||
# SSHPASSWORD=''
|
# SSHPASSWORD=''
|
||||||
# MESSAGE="Using SSH Key-Pair Authentication"
|
# MESSAGE="Using SSH Key-Pair Authentication"
|
||||||
# echo_info
|
# echo_info
|
||||||
# fi
|
# fi
|
||||||
|
|
||||||
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"
|
||||||
PKG_INSTALL="sudo apt-get --yes --no-install-recommends --quiet install"
|
PKG_INSTALL="sudo apt-get --yes --no-install-recommends --quiet install"
|
||||||
elif hash rpm 2>/dev/null
|
elif hash rpm 2>/dev/null
|
||||||
then
|
then
|
||||||
if hash dnf 2>/dev/null
|
if hash dnf 2>/dev/null
|
||||||
then
|
then
|
||||||
PKG_MANAGER="dnf"
|
PKG_MANAGER="dnf"
|
||||||
elif hash yum 2>/dev/null
|
elif hash yum 2>/dev/null
|
||||||
then
|
then
|
||||||
PKG_MANAGER="yum"
|
PKG_MANAGER="yum"
|
||||||
else
|
else
|
||||||
MESSAGE="Unable to find OS Package Manager"
|
MESSAGE="Unable to find OS Package Manager"
|
||||||
echo_info
|
echo_info
|
||||||
exit_nochange
|
exit_nochange
|
||||||
fi
|
fi
|
||||||
PKG_INSTALL="sudo ${PKG_MANAGER} install -y"
|
PKG_INSTALL="sudo ${PKG_MANAGER} install -y"
|
||||||
else
|
else
|
||||||
MESSAGE="Unable to find OS Package Manager"
|
MESSAGE="Unable to find OS Package Manager"
|
||||||
echo_info
|
echo_info
|
||||||
exit_nochange
|
exit_nochange
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
## Dropbear Warning
|
## Dropbear Warning
|
||||||
function dbclient_warning {
|
function dbclient_warning {
|
||||||
if hash dbclient 2>/dev/null
|
if hash dbclient 2>/dev/null
|
||||||
then
|
then
|
||||||
if hash ssh 2>/dev/null
|
if hash ssh 2>/dev/null
|
||||||
then
|
then
|
||||||
NOEMPTYBASHIF="1"
|
NOEMPTYBASHIF="1"
|
||||||
else
|
else
|
||||||
MESSAGE="Dropbear support has been deprecated - please convert to OpenSSH"
|
MESSAGE="Dropbear support has been deprecated - please convert to OpenSSH"
|
||||||
echo_warn
|
echo_warn
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@ -209,22 +209,22 @@ else
|
|||||||
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
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user