Mirrored_Repos/pihole-cloudsync
1
0
Fork 0
mirror of https://github.com/stevejenkins/pihole-cloudsync.git synced 2024-08-30 18:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync with pihole running in Docker

Browse Source
This commit is contained in:
Joel Goguen 2021-09-26 07:46:56 -07:00
parent 1ad2a3fed1
commit e039298355
No known key found for this signature in database
GPG Key ID: 5E6F6EBBFBB22A7C
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pihole-cloudsync
View File

@ -35,7 +35,7 @@ update='December 26, 2020'
personal_git_dir='/usr/local/bin/my-pihole-lists'
pihole_dir='/etc/pihole'
gravity_db='/etc/pihole/gravity.db'
dnsmasq_dir='/etc/dnsmasq.d/'
dnsmasq_dir='/etc/dnsmasq.d'
ad_list='adlist.csv'
custom_list='custom.list'
domain_list='domainlist.csv'
@ -49,6 +49,33 @@ if [ "$EUID" -ne 0 ]
then SUDO='sudo'
fi
# Attempt to detect pihole running in Docker
DOCKER=''
DOCKER_CMD="$(command -v docker)"
JQ_CMD="$(command -v jq)"
if [ -n "${DOCKER_CMD}" ]
then
CONTAINER="$(${DOCKER_CMD} ps -f "ancestor=pihole/pihole" --format "{{.Names}}")"
if [ -n "${CONTAINER}" ]
then
if [ -n "${JQ_CMD}" ]
then
echo "Found pihole running under Docker container '${CONTAINER}'"
pihole_dir="$(${DOCKER_CMD} inspect -f "{{json .Mounts}}" "${CONTAINER}" | ${JQ_CMD} -r --arg dir "${pihole_dir}" '.[] | select(.Destination==$dir) | .Source')"
gravity_db="${pihole_dir}/gravity.db"
dnsmasq_dir="$(${DOCKER_CMD} inspect -f "{{json .Mounts}}" "${CONTAINER}" | ${JQ_CMD} -r --arg dir "${dnsmasq_dir}" '.[] | select(.Destination==$dir) | .Source')"
echo "Found pihole directory mapped to '${pihole_dir}'"
echo "Found dnsmasq directory mapped to '${dnsmasq_dir}'"
DOCKER="${DOCKER_CMD} exec -i ${CONTAINER}"
else
echo "Found Docker container '${CONTAINER}' but jq is not installed"
fi
fi
fi
# FUNCTIONS
push_initialize () {
# Go to Pi-hole directory, exit if doesn't exist
@ -85,7 +112,7 @@ pull_initialize () {
$SUDO git reset --hard origin/master -q
# Stop DNS server
$SUDO service pihole-FTL stop
$SUDO ${DOCKER} service pihole-FTL stop
# Overwrite local files
$SUDO cp $custom_list $pihole_dir
@ -98,7 +125,7 @@ pull_initialize () {
$SUDO sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
# Restart Pi-hole to pick up changes
$SUDO pihole -g
$SUDO ${DOCKER} pihole -g
# Display success messages
echo "Local Pi-hole initialized in Pull mode and first pull successfully completed.";
@ -150,14 +177,14 @@ pull () {
# Remove -q option if you don't want to run in "quiet" mode
$SUDO git fetch --all -q
$SUDO git reset --hard origin/master -q
$SUDO service pihole-FTL stop
$SUDO ${DOCKER} service pihole-FTL stop
$SUDO cp $custom_list $pihole_dir
$SUDO cp $cname_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;"
$SUDO sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist"
$SUDO pihole -g
$SUDO ${DOCKER} pihole -g
echo 'Done!';
exit 0
else