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

Merge branch 'main' of https://git.schroedercity.com/voltron/my-pihole-sync into main

Browse Source
This commit is contained in:
root
2022-11-29 20:35:50 -06:00
parent 399ccdc321 9dca207153
commit a0fcb66e1e
1 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pihole-sync
View File

@@ -107,14 +107,10 @@ 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
# 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"
@@ -170,33 +166,29 @@ 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 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
echo "copying"
else
echo "not copying"
fi fi
echo $(/sbin/ip -o -4 addr list br0 | awk '{print $4}' | cut -d/ -f1) echo $(/sbin/ip -o -4 addr list br0 | awk '{print $4}' | cut -d/ -f1)
echo $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) echo $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1)
# 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"
# $SUDO pihole -g $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
} }