voltron/my-pihole-sync
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

intial committ2

Browse Source
This commit is contained in:
David Schroeder
2021-05-31 19:38:05 -05:00
parent 0704ebf406
commit 83237d8da1
12 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored Normal file
View File

Binary file not shown.

4
02-local-domains.conf Normal file
View File

@@ -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

0
05-pihole-custom-cname.conf Normal file
View File

2
adlist.csv Normal file
View File

@@ -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
1 id address enabled date_added date_modified comment date_updated number invalid_domains status
2 1 https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts 1 1622482057 1622482057 Migrated from /etc/pihole/adlists.list 82723 0 2

0
adlist_by_group.csv Normal file
View File

0
client.csv Normal file
View File

0
client_by_group.csv Normal file
View File

0
custom.list Normal file
View File

3
domainlist.csv Normal file
View File

@@ -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,
1 id type domain enabled date_added date_modified comment
2 1 2 (\.|^)scity\.us$ 1 1622482071 1622482071
3 2 2 (\.|^)schroedercity\.com$ 1 1622482080 1622482080

0
domainlist_by_group.csv Normal file
View File

0
group.csv Normal file
View File

6
pihole-sync
View File

@@ -40,6 +40,7 @@ ad_list='adlist.csv'
custom_list='custom.list' custom_list='custom.list'
domain_list='domainlist.csv' domain_list='domainlist.csv'
cname_list='05-pihole-custom-cname.conf' cname_list='05-pihole-custom-cname.conf'
localdomains_list='02-local-domains.conf'
########################################################################### ###########################################################################
# SHOULDN'T NEED TO EDIT BELOW THIS LINE # SHOULDN'T NEED TO EDIT BELOW THIS LINE
@@ -57,10 +58,12 @@ push_initialize () {
# Verify Custom and CNAME lists exist # Verify Custom and CNAME lists exist
$SUDO touch $custom_list $SUDO touch $custom_list
$SUDO touch $dnsmasq_dir/$cname_list $SUDO touch $dnsmasq_dir/$cname_list
$SUDO touch $dnsmasq_dir/$localdomains_list
# Copy local Custom and CNAME lists to local Git repo # Copy local Custom and CNAME lists to local Git repo
$SUDO cp $custom_list $personal_git_dir $SUDO cp $custom_list $personal_git_dir
$SUDO cp $dnsmasq_dir/$cname_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 # Go to local Git repo directory
cd $personal_git_dir || exit cd $personal_git_dir || exit
@@ -90,6 +93,7 @@ pull_initialize () {
# Overwrite local files # Overwrite local files
$SUDO cp $custom_list $pihole_dir $SUDO cp $custom_list $pihole_dir
$SUDO cp $cname_list $dnsmasq_dir $SUDO cp $cname_list $dnsmasq_dir
$SUDO cp $localdomains_list $dnsmasq_dir
# Overwrite local database tables # Overwrite local database tables
$SUDO sqlite3 $gravity_db "DROP TABLE adlist;" $SUDO sqlite3 $gravity_db "DROP TABLE adlist;"
@@ -111,6 +115,7 @@ push () {
# Copy local Custom and CNAME lists to local Git repo # Copy local Custom and CNAME lists to local Git repo
$SUDO cp $custom_list $personal_git_dir $SUDO cp $custom_list $personal_git_dir
$SUDO cp $dnsmasq_dir/$cname_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 # Go to local Git repo directory
cd $personal_git_dir || exit cd $personal_git_dir || exit
@@ -153,6 +158,7 @@ pull () {
$SUDO service pihole-FTL stop $SUDO service pihole-FTL stop
$SUDO cp $custom_list $pihole_dir $SUDO cp $custom_list $pihole_dir
$SUDO cp $cname_list $dnsmasq_dir $SUDO cp $cname_list $dnsmasq_dir
$SUDO cp $localdomains_list $dnsmasq_dir
$SUDO sqlite3 $gravity_db "DROP TABLE adlist;" $SUDO sqlite3 $gravity_db "DROP TABLE adlist;"
$SUDO sqlite3 $gravity_db -header -csv ".import adlist.csv adlist" $SUDO sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
$SUDO sqlite3 $gravity_db "DROP TABLE domainlist;" $SUDO sqlite3 $gravity_db "DROP TABLE domainlist;"