arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1238 from pi-hole/tweak/debugLogdnsmasq

Browse Source 
Scan whole dnsmasq.d directory for cofigurations files
This commit is contained in:
DL6ER 2017-02-10 20:46:01 +01:00 committed by GitHub
commit f7f1daa69f
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
advanced/Scripts/piholeDebug.sh
View File

@ -16,7 +16,7 @@ set -o pipefail
VARSFILE="/etc/pihole/setupVars.conf" VARSFILE="/etc/pihole/setupVars.conf"
DEBUG_LOG="/var/log/pihole_debug.log" DEBUG_LOG="/var/log/pihole_debug.log"
DNSMASQFILE="/etc/dnsmasq.conf" DNSMASQFILE="/etc/dnsmasq.conf"
DNSMASQCONFFILE="/etc/dnsmasq.d/01-pihole.conf" DNSMASQCONFDIR="/etc/dnsmasq.d/*"
LIGHTTPDFILE="/etc/lighttpd/lighttpd.conf" LIGHTTPDFILE="/etc/lighttpd/lighttpd.conf"
LIGHTTPDERRFILE="/var/log/lighttpd/error.log" LIGHTTPDERRFILE="/var/log/lighttpd/error.log"
GRAVITYFILE="/etc/pihole/gravity.list" GRAVITYFILE="/etc/pihole/gravity.list"
@ -132,13 +132,25 @@ version_check() {
return "${error_found}" return "${error_found}"
} }
dir_check() {
header_write "Detecting contents of ${1}:"
for file in $1*; do
header_write "File ${file} found"
echo -n "::: Parsing..."
file_parse "${file}"
echo "done"
done
echo ":::"
}
files_check() { files_check() {
#Check non-zero length existence of ${1} #Check non-zero length existence of ${1}
header_write "Detecting existence of ${1}:" header_write "Detecting existence of ${1}:"
local search_file="${1}" local search_file="${1}"
if [[ -s ${search_file} ]]; then if [[ -s ${search_file} ]]; then
echo "::: File exists" echo -n "::: File exists, parsing..."
file_parse "${search_file}" file_parse "${search_file}"
echo "done"
return 0 return 0
else else
log_echo "${1} not found!" log_echo "${1} not found!"
@ -353,7 +365,7 @@ testResolver
debugLighttpd debugLighttpd
files_check "${DNSMASQFILE}" files_check "${DNSMASQFILE}"
files_check "${DNSMASQCONFFILE}" dir_check "${DNSMASQCONFDIR}"
files_check "${WHITELISTFILE}" files_check "${WHITELISTFILE}"
files_check "${BLACKLISTFILE}" files_check "${BLACKLISTFILE}"
files_check "${ADLISTFILE}" files_check "${ADLISTFILE}"