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

Merge branch 'main' of https://git.schroedercity.com/voltron/my-pihole-sync into main

Browse Source
This commit is contained in:
root
2021-11-20 16:58:53 -06:00
parent 04d36cbf7d a7cc51b77e
commit 75f09dc2ca
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

4
.gitignore vendored Normal file
View File

@@ -0,0 +1,4 @@
.DS_Store
.DS_Store
.DS_Store

17
pihole-sync
View File

@@ -32,7 +32,12 @@ update='December 26, 2020'
# Project Home: https://github.com/stevejenkins/pihole-cloudsync # Project Home: https://github.com/stevejenkins/pihole-cloudsync
########################################################################### ###########################################################################
# CONSTANTS # CONSTANTS
personal_git_dir='/usr/local/bin/my-pihole-sync' if [ -f "/opt/pihole-docker" ]; then
personal_git_dir='/opt/my-pihole-sync'
else
personal_git_dir='/usr/local/bin/my-pihole-sync'
fi
# if [ -d "/opt/docker-pi-hole/etc-pihole" ]; then # if [ -d "/opt/docker-pi-hole/etc-pihole" ]; then
# pihole_dir='/opt/docker-pi-hole/etc-pihole' # pihole_dir='/opt/docker-pi-hole/etc-pihole'
@@ -71,7 +76,6 @@ push_initialize () {
# Copy local Custom and CNAME lists to local Git repo # Copy local Custom and CNAME lists to local Git repo
cp $custom_list $personal_git_dir cp $custom_list $personal_git_dir
cp $dnsmasq_dir/$cname_list $personal_git_dir cp $dnsmasq_dir/$cname_list $personal_git_dir
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
@@ -101,7 +105,9 @@ pull_initialize () {
# Overwrite local files # Overwrite local files
cp $custom_list $pihole_dir cp $custom_list $pihole_dir
cp $cname_list $dnsmasq_dir cp $cname_list $dnsmasq_dir
cp $localdomains_list $dnsmasq_dir if [ ! -f "/opt/pihole-docker" ]; then
cp $localdomains_list $dnsmasq_dir
fi
# Overwrite local database tables # Overwrite local database tables
sqlite3 $gravity_db "DROP TABLE adlist;" sqlite3 $gravity_db "DROP TABLE adlist;"
@@ -166,7 +172,9 @@ pull () {
$SUDO service pihole-FTL stop $SUDO service pihole-FTL stop
cp $custom_list $pihole_dir cp $custom_list $pihole_dir
cp $cname_list $dnsmasq_dir cp $cname_list $dnsmasq_dir
cp $localdomains_list $dnsmasq_dir if [ ! -f "/opt/pihole-docker" ]; then
cp $localdomains_list $dnsmasq_dir
fi
sqlite3 $gravity_db "DROP TABLE adlist;" sqlite3 $gravity_db "DROP TABLE adlist;"
sqlite3 $gravity_db -header -csv ".import adlist.csv adlist" sqlite3 $gravity_db -header -csv ".import adlist.csv adlist"
sqlite3 $gravity_db "DROP TABLE domainlist;" sqlite3 $gravity_db "DROP TABLE domainlist;"
@@ -179,6 +187,7 @@ pull () {
exit 0 exit 0
fi fi
} }
########################################################################### ###########################################################################
# Check to see whether a command line option was provided # Check to see whether a command line option was provided
if [ -z "$1" ] if [ -z "$1" ]