From 874853fe1846e429c6caf5da44cb4d1fc1fddc89 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Mon, 26 Sep 2016 19:23:30 -0700 Subject: [PATCH] Add lighttpd to version check --- advanced/Scripts/piholeDebug.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh index 05f3cff8..acdb699a 100755 --- a/advanced/Scripts/piholeDebug.sh +++ b/advanced/Scripts/piholeDebug.sh @@ -72,6 +72,15 @@ function versionCheck { echo "::: Writing Pi-hole installed version to logfile." TMP=$(cd /var/www/html/admin && git describe --tags --abbrev=0) echo "WebUI Version: $TMP" >> ${DEBUG_LOG} + + echo "::: Writing lighttpd version to logfile." + light_ver=$(lighttpd -v | head -n1) + if [ -n light_ver ] + then + echo "${light_ver}" >> ${DEBUG_LOG} + else + echo "lighttpd not installed." >> ${DEBUG_LOG} + fi echo >> ${DEBUG_LOG} } @@ -121,14 +130,17 @@ function ipCheck { } function hostnameCheck { + echo "############################################################" >> ${DEBUG_LOG} + echo "######## Hostname Information #########" >> ${DEBUG_LOG} + echo "############################################################" >> ${DEBUG_LOG} + + echo "::: Writing locally configured hostnames to logfile" # 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 "This Pi-hole is: $(hostname)" >> ${DEBUG_LOG} echo "::: Writing hosts file to debug log..." - echo "#######################################" >> ${DEBUG_LOG} - echo "################ Hosts ################" >> ${DEBUG_LOG} - echo "#######################################" >> ${DEBUG_LOG} + echo "### Hosts ###" >> ${DEBUG_LOG} + if [ -e "$HOSTSFILE" ] then cat "$HOSTSFILE" >> ${DEBUG_LOG}