diff --git a/pihole-sync b/pihole-sync index 0e4971e..6624fa2 100755 --- a/pihole-sync +++ b/pihole-sync @@ -34,15 +34,15 @@ update='December 26, 2020' # CONSTANTS personal_git_dir='/usr/local/bin/my-pihole-sync' -if [ -d "/opt/docker-pi-hole/etc-pihole" ]; then - pihole_dir='/opt/docker-pi-hole/etc-pihole' - gravity_db='/opt/docker-pi-hole/etc-pihole/gravity.db' - dnsmasq_dir='/opt/docker-pi-hole/etc-dnsmasq.d/' -else +# if [ -d "/opt/docker-pi-hole/etc-pihole" ]; then +# pihole_dir='/opt/docker-pi-hole/etc-pihole' +# gravity_db='/opt/docker-pi-hole/etc-pihole/gravity.db' +# dnsmasq_dir='/opt/docker-pi-hole/etc-dnsmasq.d/' +# else pihole_dir='/etc/pihole' gravity_db='/etc/pihole/gravity.db' dnsmasq_dir='/etc/dnsmasq.d/' -fi +# fi ad_list='adlist.csv' custom_list='custom.list' @@ -54,16 +54,8 @@ localdomains_list='02-local-domains.conf' # Force sudo if not running with root privileges SUDO='' -if [ -d "/opt/docker-pi-hole/etc-pihole" ]; then - if [ "$EUID" -ne 0 ]; then - SUDO='sudo docker exec -it pihole' - else - SUDO='docker exec -it pihole' - fi -else - if [ "$EUID" -ne 0 ] - then SUDO='sudo' - fi +if [ "$EUID" -ne 0 ] + then SUDO='sudo' fi # FUNCTIONS