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

fix

Browse Source
This commit is contained in:
David Schroeder
2022-01-30 14:39:48 -06:00
parent 7c6595a6df
commit 6dfcef7225
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
02-local-domains.conf
View File

@@ -1,9 +1,9 @@
server=/scity.us/10.10.1.1
server=/scity.us/10.10.10.11
server=/scity.us/172.19.0.10
server=/schroedercity.com/10.10.1.1
server=/schroedercity.com/10.10.10.11
server=/schroedercity.com/172.19.0.10
server=/misfitsmc.com/10.10.1.1
server=/misfitsmc.com/10.10.10.11
server=/misfitsmc.com/172.19.0.10
server=/scity.xyz/10.10.1.1
server=/scity.xyz/10.10.10.11
server=/scity.xyz/172.19.0.10

16
pihole-sync
View File

@@ -32,7 +32,7 @@ update='December 26, 2020'
# Project Home: https://github.com/stevejenkins/pihole-cloudsync
###########################################################################
# CONSTANTS
if [ -f "/opt/pihole-docker" ]; then
if [ -f "/opt/docker-pi-hole/pihole-sync" ]; then
personal_git_dir='/opt/my-pihole-sync'
else
personal_git_dir='/usr/local/bin/my-pihole-sync'
@@ -105,9 +105,9 @@ pull_initialize () {
# Overwrite local files
cp $custom_list $pihole_dir
cp $cname_list $dnsmasq_dir
if [ ! -f "/opt/pihole-docker" ]; then
cp $localdomains_list $dnsmasq_dir
fi
# if [ ! -f "/opt/pihole-docker" ]; then
# cp $localdomains_list $dnsmasq_dir
# fi
# Overwrite local database tables
sqlite3 $gravity_db "DROP TABLE adlist;"
@@ -129,7 +129,7 @@ push () {
# Copy local Custom and CNAME lists to local Git repo
cp $custom_list $personal_git_dir
cp $dnsmasq_dir/$cname_list $personal_git_dir
cp $dnsmasq_dir/$localdomains_list $personal_git_dir
# cp $dnsmasq_dir/$localdomains_list $personal_git_dir
# Go to local Git repo directory
cd $personal_git_dir || exit
@@ -172,9 +172,9 @@ pull () {
$SUDO service pihole-FTL stop
cp $custom_list $pihole_dir
cp $cname_list $dnsmasq_dir
if [ ! -f "/opt/pihole-docker" ]; then
cp $localdomains_list $dnsmasq_dir
fi
# if [ ! -f "/opt/pihole-docker" ]; then
# cp $localdomains_list $dnsmasq_dir
# fi
sqlite3 $gravity_db "DROP TABLE adlist;"
sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
sqlite3 $gravity_db "DROP TABLE domainlist;"