kyle/kp-pihole-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update pihole-sync

Browse Source
This commit is contained in:
David Schroeder
2022-11-29 20:33:55 -06:00
parent fd0037d2b7
commit 7c572fffd9
1 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
pihole-sync
View File

@@ -107,11 +107,8 @@ pull_initialize () {
# 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 eth0 | awk '{print $4}' | cut -d/ -f1) != *"10.10.10.11"* ]]; then
# cp $localdomains_list $dnsmasq_dir cp $localdomains_list $dnsmasq_dir
echo "copying"
else
echo "not copying"
fi fi
@@ -164,39 +161,35 @@ push () {
fi fi
} }
pull () { pull () {
# Go to Pi-hole directory, exit if doesn't exist # Go to Pi-hole directory, exit if doesn't exist
cd $personal_git_dir || exit cd $personal_git_dir || exit
# 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 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 [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"10.10.10.11"* ]]; then
if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *"10.10.10.11"* ]]; then cp $localdomains_list $dnsmasq_dir
# cp $localdomains_list $dnsmasq_dir fi
echo "copying" echo $(/sbin/ip -o -4 addr list br0 | awk '{print $4}' | cut -d/ -f1)
else echo $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1)
echo "not copying" sqlite3 $gravity_db "DROP TABLE adlist;"
fi sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
echo $(/sbin/ip -o -4 addr list br0 | awk '{print $4}' | cut -d/ -f1) sqlite3 $gravity_db "DROP TABLE domainlist;"
echo $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) 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" echo 'Done!';
# sqlite3 $gravity_db "DROP TABLE domainlist;" exit 0
# sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist" else
# $SUDO pihole -g echo 'Local Pi-hole lists match remote Git repo. No further action required.';
echo 'Done!'; exit 0
exit 0 fi
# else
# echo 'Local Pi-hole lists match remote Git repo. No further action required.';
# exit 0
# fi
} }