diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/.DS_Store differ 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;"