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