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

Adding some credits, allowing for ENV file and defaulting to original values.

Browse Source
This commit is contained in:
Jon Stephens 2021-12-09 21:02:55 -08:00
parent 8033dbebf1
commit 70b9fd7bab
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pihole-cloudsync
View File

@ -4,11 +4,25 @@
# pihole-cloudsync # pihole-cloudsync
# Helper script to keep multiple Pi-holes' lists synchronized via Git # Helper script to keep multiple Pi-holes' lists synchronized via Git
# ORIGINAL AUTHOR
# Steve Jenkins (stevejenkins.com) # Steve Jenkins (stevejenkins.com)
# https://github.com/stevejenkins/pihole-cloudsync # https://github.com/stevejenkins/pihole-cloudsync
version='5.0' # Joel Goguen
update='December 26, 2020' # https://github.com/jgoguen/pihole-cloudsync
# * Provide docker support
# * Allow non-master branches
# Jon Stephens
# https://github.com/wetnun/pihole-cloudsync
# * Remove collection of csv files in favor of dump
# * Move import/export to helper functions
# * Allow ENV file so you don't have to edit git files
# * Fix issue of custom whitelist/domains don't work in agents because of groups missing
# * Removed hard tabs, I just don't like them
version='6.0'
update='December 9, 2021'
# SETUP # SETUP
# Follow the instructions in the README to set up your own private Git # Follow the instructions in the README to set up your own private Git
@ -30,14 +44,19 @@ update='December 26, 2020'
# 'pihole-cloudsync --pull' will pull (download) your lists from a remote Git repo # 'pihole-cloudsync --pull' will pull (download) your lists from a remote Git repo
# Project Home: https://github.com/stevejenkins/pihole-cloudsync # Project Home: https://github.com/stevejenkins/pihole-cloudsync
# Create env.sh file with presets if you don't want to edit this file
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
[ -f "${SCRIPT_DIR}/env.sh" ] && source "${SCRIPT_DIR}/env.sh"
########################################################################### ###########################################################################
# CONSTANTS # CONSTANTS
personal_git_dir='/data/pihole/pihole-config' personal_git_dir="${GIT_CONFIG_DIR:-/usr/local/bin/my-pihole-lists}"
pihole_dir='/etc/pihole' pihole_dir="${PIHOLE_DIR:-/etc/pihole}"
gravity_db='/etc/pihole/gravity.db' gravity_db="${GRAVITY_DB:-/etc/pihole/gravity.db}"
dnsmasq_dir='/etc/dnsmasq.d' dnsmasq_dir="${DNSMASQ_DIR:-/etc/dnsmasq.d}"
custom_list='custom.list' custom_list="${CUSTOM_LIST:-custom.list}"
cname_list='05-pihole-custom-cname.conf' cname_list="${CNAME_LIST:-05-pihole-custom-cname.conf}"
########################################################################### ###########################################################################
# SHOULDN'T NEED TO EDIT BELOW THIS LINE # SHOULDN'T NEED TO EDIT BELOW THIS LINE