From 6dfcef7225c3913fcd1b58e9cf2fd871fc2d3d2b Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 30 Jan 2022 14:39:48 -0600
Subject: [PATCH] fix

---
 02-local-domains.conf |  8 ++++----
 pihole-sync           | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/02-local-domains.conf b/02-local-domains.conf
index d07a476..7d683ad 100644
--- a/02-local-domains.conf
+++ b/02-local-domains.conf
@@ -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
 
diff --git a/pihole-sync b/pihole-sync
index 9095f96..630bf4d 100755
--- a/pihole-sync
+++ b/pihole-sync
@@ -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;"