mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-11-15 10:43:55 +00:00
Relocate hostname checks
This commit is contained in:
parent
c41d543d81
commit
274b71f8bc
1 changed files with 21 additions and 16 deletions
|
@ -119,6 +119,26 @@ function ipCheck {
|
||||||
fi
|
fi
|
||||||
echo >> ${DEBUG_LOG}
|
echo >> ${DEBUG_LOG}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hostnameCheck {
|
||||||
|
# Write the hostname output to compare against entries in /etc/hosts, which is logged next
|
||||||
|
echo "Hostname of this pihole is: " >> ${DEBUG_LOG}
|
||||||
|
hostname >> ${DEBUG_LOG}
|
||||||
|
|
||||||
|
echo "::: Writing hosts file to debug log..."
|
||||||
|
echo "#######################################" >> ${DEBUG_LOG}
|
||||||
|
echo "################ Hosts ################" >> ${DEBUG_LOG}
|
||||||
|
echo "#######################################" >> ${DEBUG_LOG}
|
||||||
|
if [ -e "$HOSTSFILE" ]
|
||||||
|
then
|
||||||
|
cat "$HOSTSFILE" >> ${DEBUG_LOG}
|
||||||
|
echo >> ${DEBUG_LOG}
|
||||||
|
else
|
||||||
|
echo "No hosts file found!" >> ${DEBUG_LOG}
|
||||||
|
printf ":::\tNo hosts file found!\n"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
function compareWhitelist {
|
function compareWhitelist {
|
||||||
if [ ! -f "$WHITELISTMATCHES" ]; then
|
if [ ! -f "$WHITELISTMATCHES" ]; then
|
||||||
${SUDO} touch ${WHITELISTMATCHES}
|
${SUDO} touch ${WHITELISTMATCHES}
|
||||||
|
@ -236,6 +256,7 @@ function debugLighttpd {
|
||||||
versionCheck
|
versionCheck
|
||||||
distroCheck
|
distroCheck
|
||||||
ipCheck
|
ipCheck
|
||||||
|
hostnameCheck
|
||||||
compareWhitelist
|
compareWhitelist
|
||||||
compareBlacklist
|
compareBlacklist
|
||||||
testNslookup
|
testNslookup
|
||||||
|
@ -292,22 +313,6 @@ else
|
||||||
printf ":::\tNo gravity.list file found\n"
|
printf ":::\tNo gravity.list file found\n"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Write the hostname output to compare against entries in /etc/hosts, which is logged next
|
|
||||||
echo "Hostname of this pihole is: " >> ${DEBUG_LOG}
|
|
||||||
hostname >> ${DEBUG_LOG}
|
|
||||||
|
|
||||||
echo "::: Writing hosts file to debug log..."
|
|
||||||
echo "#######################################" >> ${DEBUG_LOG}
|
|
||||||
echo "################ Hosts ################" >> ${DEBUG_LOG}
|
|
||||||
echo "#######################################" >> ${DEBUG_LOG}
|
|
||||||
if [ -e "$HOSTSFILE" ]
|
|
||||||
then
|
|
||||||
cat "$HOSTSFILE" >> ${DEBUG_LOG}
|
|
||||||
echo >> ${DEBUG_LOG}
|
|
||||||
else
|
|
||||||
echo "No hosts file found!" >> ${DEBUG_LOG}
|
|
||||||
printf ":::\tNo hosts file found!\n"
|
|
||||||
fi
|
|
||||||
|
|
||||||
### PiHole application specific logging ###
|
### PiHole application specific logging ###
|
||||||
echo "::: Writing whitelist to debug log..."
|
echo "::: Writing whitelist to debug log..."
|
||||||
|
|
Loading…
Reference in a new issue