voltron/my-pihole-sync
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update pihole-sync

Browse Source
This commit is contained in:
David Schroeder
2022-11-29 20:25:08 -06:00
parent 66706866e2
commit 403d5cc472
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
pihole-sync
View File

@@ -102,11 +102,11 @@ pull_initialize () {
git reset --hard origin/main -q git reset --hard origin/main -q
# Stop DNS server # Stop DNS server
# $SUDO service pihole-FTL stop $SUDO service pihole-FTL stop
# Overwrite local files # Overwrite local files
# cp $custom_list $pihole_dir cp $custom_list $pihole_dir
# cp $cname_list $dnsmasq_dir cp $cname_list $dnsmasq_dir
if [ $(/sbin/ip -o -4 addr list br0 | awk '{print $4}' | cut -d/ -f1) != "10.5.1.1" ] && [ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != "10.10.10.10" ]; then if [ $(/sbin/ip -o -4 addr list br0 | awk '{print $4}' | cut -d/ -f1) != "10.5.1.1" ] && [ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != "10.10.10.10" ]; then
# cp $localdomains_list $dnsmasq_dir # cp $localdomains_list $dnsmasq_dir
echo "copying" echo "copying"
@@ -114,14 +114,15 @@ pull_initialize () {
echo "not copying" echo "not copying"
fi fi
# Overwrite local database tables # Overwrite local database tables
# sqlite3 $gravity_db "DROP TABLE adlist;" sqlite3 $gravity_db "DROP TABLE adlist;"
# sqlite3 $gravity_db -header -csv ".import adlist.csv adlist" sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
# sqlite3 $gravity_db "DROP TABLE domainlist;" sqlite3 $gravity_db "DROP TABLE domainlist;"
# sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist" sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
# Restart Pi-hole to pick up changes # Restart Pi-hole to pick up changes
# $SUDO pihole -g $SUDO pihole -g
# Display success messages # Display success messages
echo "Local Pi-hole initialized in Pull mode and first pull successfully completed."; echo "Local Pi-hole initialized in Pull mode and first pull successfully completed.";
@@ -169,28 +170,31 @@ pull () {
# Update local Git repo from remote Git repo # Update local Git repo from remote Git repo
git remote update > /dev/null git remote update > /dev/null
CHANGED=$(git log HEAD..origin/main --oneline) CHANGED=$(git log HEAD..origin/main --oneline)
if [ -n "${CHANGED}" ]; then # if [ -n "${CHANGED}" ]; then
echo 'Remote Git repo is different than local Pi-hole lists. Updating local lists...'; echo 'Remote Git repo is different than local Pi-hole lists. Updating local lists...';
# Remove -q option if you don't want to run in "quiet" mode # Remove -q option if you don't want to run in "quiet" mode
git fetch --all -q # git fetch --all -q
git reset --hard origin/main -q # git reset --hard origin/main -q
$SUDO service pihole-FTL stop # $SUDO service pihole-FTL stop
cp $custom_list $pihole_dir # cp $custom_list $pihole_dir
cp $cname_list $dnsmasq_dir # cp $cname_list $dnsmasq_dir
# if [ ! -f "/opt/pihole-docker" ]; then if [ $(/sbin/ip -o -4 addr list br0 | awk '{print $4}' | cut -d/ -f1) != "10.5.1.1" ] && [ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != "10.10.10.10" ]; then
cp $localdomains_list $dnsmasq_dir # cp $localdomains_list $dnsmasq_dir
# fi echo "copying"
sqlite3 $gravity_db "DROP TABLE adlist;" else
sqlite3 $gravity_db -header -csv ".import adlist.csv adlist" echo "not copying"
sqlite3 $gravity_db "DROP TABLE domainlist;" fi
sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist" # sqlite3 $gravity_db "DROP TABLE adlist;"
$SUDO pihole -g # sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
# sqlite3 $gravity_db "DROP TABLE domainlist;"
# sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
# $SUDO pihole -g
echo 'Done!'; echo 'Done!';
exit 0 exit 0
else # else
echo 'Local Pi-hole lists match remote Git repo. No further action required.'; # echo 'Local Pi-hole lists match remote Git repo. No further action required.';
exit 0 # exit 0
fi # fi
} }
@@ -226,7 +230,7 @@ do
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" == "-?" ]