Mirrored_Repos/pihole-cloudsync
1
0
Fork 0
mirror of https://github.com/stevejenkins/pihole-cloudsync.git synced 2024-08-30 18:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release 1.7

Browse Source
This commit is contained in:
Steve Jenkins 2019-07-10 13:46:42 -07:00
parent df7c91184a
commit f5b7091526
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pihole-cloudsync.sh
View File

@ -1,11 +1,10 @@
#!/bin/bash #!/bin/bash
########################################################################### ###########################################################################
# pihole-cloudsync # pihole-cloudsync
# Helper script to keep multiple Pi-holes' lists synchronized via Git # Helper script to keep multiple Pi-holes' lists synchronized via Git
# Version 1.6 - July 10, 2019 - Steve Jenkins (stevejenkins.com) # Version 1.7 - July 10, 2019 - Steve Jenkins (stevejenkins.com)
# SETUP # SETUP
# Follow the instructions in the README to set up your own private Git # Follow the instructions in the README to set up your own private Git
@ -25,9 +24,7 @@
# 'pihole-cloudsync --pull' will pull (download) your lists from a remote Git repo # 'pihole-cloudsync --pull' will pull (download) your lists from a remote Git repo
# Project Home: https://github.com/stevejenkins/pihole-cloudsync # Project Home: https://github.com/stevejenkins/pihole-cloudsync
########################################################################### ###########################################################################
# CONSTANTS # CONSTANTS
personal_git_dir='/usr/local/bin/my-pihole-lists' personal_git_dir='/usr/local/bin/my-pihole-lists'
pihole_dir='/etc/pihole' pihole_dir='/etc/pihole'
@ -36,6 +33,8 @@ black_list='black.list'
blacklist_list='blacklist.txt' blacklist_list='blacklist.txt'
whitelist_list='whitelist.txt' whitelist_list='whitelist.txt'
regex_list='regex.list' regex_list='regex.list'
###########################################################################
# SHOULDN'T NEED TO EDIT BELOW THIS LINE
# Force sudo if not running with root privileges # Force sudo if not running with root privileges
SUDO='' SUDO=''
@ -46,12 +45,12 @@ fi
# FUNCTIONS # FUNCTIONS
initialize () { initialize () {
cd $pihole_dir || exit cd $pihole_dir || exit
$SUDO touch $ad_list $black_list $blacklist_list $whitelist_list $regex_list
$SUDO cp $ad_list $black_list $blacklist_list $whitelist_list $regex_list $personal_git_dir $SUDO cp $ad_list $black_list $blacklist_list $whitelist_list $regex_list $personal_git_dir
cd $personal_git_dir || exit cd $personal_git_dir || exit
$SUDO git add . $SUDO git add .
echo "Local Pi-hole lists added to local Git repo. Run 'pihole-cloudsync --push' to push to remote Git repo."; echo "Local Pi-hole lists added to local Git repo. Run 'pihole-cloudsync --push' to push to remote Git repo.";
} }
push () { push () {
cd $pihole_dir || exit cd $pihole_dir || exit
$SUDO cp $ad_list $black_list $blacklist_list $whitelist_list $regex_list $personal_git_dir $SUDO cp $ad_list $black_list $blacklist_list $whitelist_list $regex_list $personal_git_dir
@ -70,7 +69,6 @@ push () {
exit 0 exit 0
fi fi
} }
pull () { pull () {
cd $personal_git_dir || exit cd $personal_git_dir || exit
CHANGED=$($SUDO git remote update && git --work-tree=$personal_git_dir status --porcelain) CHANGED=$($SUDO git remote update && git --work-tree=$personal_git_dir status --porcelain)
@ -88,41 +86,34 @@ pull () {
exit 0 exit 0
fi fi
} }
###########################################################################
####################################################### # Check to see whether a command line option was provided
# Check to see whether command line option was provided
if [ -z "$1" ] if [ -z "$1" ]
then then
echo "Missing command line option. Try --push, --pull, or --help." echo "Missing command line option. Try --push, --pull, or --help."
exit 1 exit 1
fi fi
# Determine which action to perform (Init, Push, Pull, or Help)
# Determine which action to perform (Push, Pull, or Help)
for arg in "$@" for arg in "$@"
do do
# Initialize - adds primary Pi-hole's lists to local Git repo before first push/upload # Initialize - adds primary Pi-hole's lists to local Git repo before first push/upload
if [ "$arg" == "--initialize" ] || [ "$arg" == "--init" ] || [ "$arg" == "-i" ] if [ "$arg" == "--initialize" ] || [ "$arg" == "--init" ] || [ "$arg" == "-i" ]
then then
echo "$arg option detected. Initializing local Git repo for Push/Upload."; echo "$arg option detected. Initializing local Git repo for Push/Upload.";
initialize initialize
exit 0 exit 0
# Push / Upload - Pushes updated local Pi-hole lists to remote Git repo # Push / Upload - Pushes updated local Pi-hole lists to remote Git repo
elif [ "$arg" == "--push" ] || [ "$arg" == "--upload" ] || [ "$arg" == "--up" ] || [ "$arg" == "-u" ] elif [ "$arg" == "--push" ] || [ "$arg" == "--upload" ] || [ "$arg" == "--up" ] || [ "$arg" == "-u" ]
then then
echo "$arg option detected. Running in Push/Upload mode." echo "$arg option detected. Running in Push/Upload mode."
push push
exit 0 exit 0
# Pull / Download - Pulls updated Pi-hole lists from remote Git repo # Pull / Download - Pulls updated Pi-hole lists from remote Git repo
elif [ "$arg" == "--pull" ] || [ "$arg" == "--download" ] || [ "$arg" == "--down" ]|| [ "$arg" == "-d" ] elif [ "$arg" == "--pull" ] || [ "$arg" == "--download" ] || [ "$arg" == "--down" ]|| [ "$arg" == "-d" ]
then then
echo "$arg option detected. Running in Pull/Download mode." echo "$arg option detected. Running in Pull/Download mode."
pull pull
exit 0 exit 0
# Help - Displays help dialog # Help - Displays help dialog
elif [ "$arg" == "--help" ] || [ "$arg" == "-h" ] || [ "$arg" == "-?" ] elif [ "$arg" == "--help" ] || [ "$arg" == "-h" ] || [ "$arg" == "-?" ]
then then
@ -142,7 +133,7 @@ Examples:
Project Home: https://github.com/stevejenkins/pihole-cloudsync Project Home: https://github.com/stevejenkins/pihole-cloudsync
EOF EOF
# Invalid commang line option was passed # Invalid command line option was passed
else else
echo "Invalid command line option. Try --push, --pull, or --help." echo "Invalid command line option. Try --push, --pull, or --help."
exit 1 exit 1