From 83237d8da192df4b280d3f404b272df5d267b976 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 31 May 2021 19:38:05 -0500
Subject: [PATCH] intial committ2

---
 .DS_Store                   | Bin 0 -> 6148 bytes
 02-local-domains.conf       |   4 ++++
 05-pihole-custom-cname.conf |   0
 adlist.csv                  |   2 ++
 adlist_by_group.csv         |   0
 client.csv                  |   0
 client_by_group.csv         |   0
 custom.list                 |   0
 domainlist.csv              |   3 +++
 domainlist_by_group.csv     |   0
 group.csv                   |   0
 pihole-sync                 |   6 ++++++
 12 files changed, 15 insertions(+)
 create mode 100644 .DS_Store
 create mode 100644 02-local-domains.conf
 create mode 100644 05-pihole-custom-cname.conf
 create mode 100644 adlist.csv
 create mode 100644 adlist_by_group.csv
 create mode 100644 client.csv
 create mode 100644 client_by_group.csv
 create mode 100644 custom.list
 create mode 100644 domainlist.csv
 create mode 100644 domainlist_by_group.csv
 create mode 100644 group.csv

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/02-local-domains.conf b/02-local-domains.conf
new file mode 100644
index 0000000..abe1f92
--- /dev/null
+++ b/02-local-domains.conf
@@ -0,0 +1,4 @@
+server=/scity.us/10.10.10.10
+server=/scity.us/10.5.10.5
+server=/schroedercity.com/10.10.10.10
+server=/schroedercity.com/10.5.10.5
diff --git a/05-pihole-custom-cname.conf b/05-pihole-custom-cname.conf
new file mode 100644
index 0000000..e69de29
diff --git a/adlist.csv b/adlist.csv
new file mode 100644
index 0000000..9782cdb
--- /dev/null
+++ b/adlist.csv
@@ -0,0 +1,2 @@
+id,address,enabled,date_added,date_modified,comment,date_updated,number,invalid_domains,status
+1,https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts,1,1622482057,1622482057,"Migrated from /etc/pihole/adlists.list","",82723,0,2
diff --git a/adlist_by_group.csv b/adlist_by_group.csv
new file mode 100644
index 0000000..e69de29
diff --git a/client.csv b/client.csv
new file mode 100644
index 0000000..e69de29
diff --git a/client_by_group.csv b/client_by_group.csv
new file mode 100644
index 0000000..e69de29
diff --git a/custom.list b/custom.list
new file mode 100644
index 0000000..e69de29
diff --git a/domainlist.csv b/domainlist.csv
new file mode 100644
index 0000000..46ceb93
--- /dev/null
+++ b/domainlist.csv
@@ -0,0 +1,3 @@
+id,type,domain,enabled,date_added,date_modified,comment
+1,2,(\.|^)scity\.us$,1,1622482071,1622482071,
+2,2,(\.|^)schroedercity\.com$,1,1622482080,1622482080,
diff --git a/domainlist_by_group.csv b/domainlist_by_group.csv
new file mode 100644
index 0000000..e69de29
diff --git a/group.csv b/group.csv
new file mode 100644
index 0000000..e69de29
diff --git a/pihole-sync b/pihole-sync
index 08555d9..9522b71 100755
--- a/pihole-sync
+++ b/pihole-sync
@@ -40,6 +40,7 @@ ad_list='adlist.csv'
 custom_list='custom.list'
 domain_list='domainlist.csv'
 cname_list='05-pihole-custom-cname.conf'
+localdomains_list='02-local-domains.conf'
 ###########################################################################
 # SHOULDN'T NEED TO EDIT BELOW THIS LINE
 
@@ -57,10 +58,12 @@ push_initialize () {
 	# Verify Custom and CNAME lists exist
 	$SUDO touch $custom_list
 	$SUDO touch $dnsmasq_dir/$cname_list
+	$SUDO touch $dnsmasq_dir/$localdomains_list
 
 	# Copy local Custom and CNAME lists to local Git repo
 	$SUDO cp $custom_list $personal_git_dir
 	$SUDO cp $dnsmasq_dir/$cname_list $personal_git_dir
+	$SUDO cp $dnsmasq_dir/$localdomains_list $personal_git_dir
 
 	# Go to local Git repo directory
 	cd $personal_git_dir || exit
@@ -90,6 +93,7 @@ pull_initialize () {
 	# Overwrite local files
 	$SUDO cp $custom_list $pihole_dir
 	$SUDO cp $cname_list $dnsmasq_dir
+	$SUDO cp $localdomains_list $dnsmasq_dir
 
 	# Overwrite local database tables
 	$SUDO sqlite3 $gravity_db "DROP TABLE adlist;"
@@ -111,6 +115,7 @@ push () {
         # Copy local Custom and CNAME lists to local Git repo
         $SUDO cp $custom_list $personal_git_dir
         $SUDO cp $dnsmasq_dir/$cname_list $personal_git_dir
+        $SUDO cp $dnsmasq_dir/$localdomains_list $personal_git_dir
 
 	# Go to local Git repo directory
         cd $personal_git_dir || exit
@@ -153,6 +158,7 @@ pull () {
                 $SUDO service pihole-FTL stop
                 $SUDO cp $custom_list $pihole_dir
                 $SUDO cp $cname_list $dnsmasq_dir
+                $SUDO cp $localdomains_list $dnsmasq_dir
                 $SUDO sqlite3 $gravity_db "DROP TABLE adlist;"
                 $SUDO sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
                 $SUDO sqlite3 $gravity_db "DROP TABLE domainlist;"