Fix shebang line broken in #831
Remove root check and references to ${SUDO} Check for /etc/pihole/setupVars.conf and use piholeInterace in IPv6 checks as suggest by @jacobsalmela https://github.com/pi-hole/pi-hole/pull/831#issuecomment-255606854
This commit is contained in:
parent
1f0ae16216
commit
2b2c240d39
|
@ -1,4 +1,4 @@
|
||||||
usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# Pi-hole: A black hole for Internet advertisements
|
# Pi-hole: A black hole for Internet advertisements
|
||||||
# (c) 2015, 2016 by Jacob Salmela
|
# (c) 2015, 2016 by Jacob Salmela
|
||||||
# Network-wide ad blocking via your Raspberry Pi
|
# Network-wide ad blocking via your Raspberry Pi
|
||||||
|
@ -36,28 +36,11 @@ cat << EOM
|
||||||
:::
|
:::
|
||||||
EOM
|
EOM
|
||||||
|
|
||||||
|
|
||||||
######## FIRST CHECK ########
|
|
||||||
# Must be root to debug
|
|
||||||
if [[ "${EUID}" -eq 0 ]]; then
|
|
||||||
echo "::: Script is executing as root user..."
|
|
||||||
else
|
|
||||||
echo "::: Non-root user detected..."
|
|
||||||
# Check if sudo is actually installed
|
|
||||||
if [ -x "$(command -v sudo)" ]; then
|
|
||||||
export SUDO="sudo"
|
|
||||||
echo "::: sudo command located, debug will run under sudo."
|
|
||||||
else
|
|
||||||
echo "::: Unable to locate sudo command. Please install sudo or run this as root."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ensure the file exists, create if not, clear if exists.
|
# Ensure the file exists, create if not, clear if exists.
|
||||||
if [ ! -f "${DEBUG_LOG}" ]; then
|
if [ ! -f "${DEBUG_LOG}" ]; then
|
||||||
${SUDO} touch ${DEBUG_LOG}
|
touch ${DEBUG_LOG}
|
||||||
${SUDO} chmod 644 ${DEBUG_LOG}
|
chmod 644 ${DEBUG_LOG}
|
||||||
${SUDO} chown "$USER":root ${DEBUG_LOG}
|
chown "$USER":root ${DEBUG_LOG}
|
||||||
else
|
else
|
||||||
truncate -s 0 ${DEBUG_LOG}
|
truncate -s 0 ${DEBUG_LOG}
|
||||||
fi
|
fi
|
||||||
|
@ -85,6 +68,36 @@ version_check() {
|
||||||
php_ver="$(php -v |& head -n1)" && log_write "${php_ver}" || log_write "PHP not installed."
|
php_ver="$(php -v |& head -n1)" && log_write "${php_ver}" || log_write "PHP not installed."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
files_check() {
|
||||||
|
log_write "############################################################"
|
||||||
|
log_write "########## Files Check ##########"
|
||||||
|
log_write "############################################################"
|
||||||
|
|
||||||
|
#Check existence of setupVars.conf, and source it to get configured network interface for later use in script.
|
||||||
|
echo -n "::: Detecting existence setupVars.conf..."
|
||||||
|
setupVars=/etc/pihole/setupVars.conf
|
||||||
|
if [[ -f ${setupVars} ]];then
|
||||||
|
echo " found!"
|
||||||
|
log_write "/etc/pihole/setupVars.conf exists! Contents:"
|
||||||
|
while read -r line; do
|
||||||
|
if [ ! -z "${line}" ]; then
|
||||||
|
[[ "${line}" =~ ^#.*$ ]] && continue
|
||||||
|
log_write "${line}"
|
||||||
|
fi
|
||||||
|
done < "${setupVars}"
|
||||||
|
log_write ""
|
||||||
|
|
||||||
|
. "${setupVars}"
|
||||||
|
if [[ -n "${piholeInterface}" ]]; then
|
||||||
|
# prepend % to the beginning of piholeInterface for later use
|
||||||
|
piholeInterface="%${piholeInterface}"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo " NOT FOUND!"
|
||||||
|
log_write "/etc/pihole/setupVars.conf not found!"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
distro_check() {
|
distro_check() {
|
||||||
echo "############################################################" >> ${DEBUG_LOG}
|
echo "############################################################" >> ${DEBUG_LOG}
|
||||||
echo "######## Installed OS Distribution #########" >> ${DEBUG_LOG}
|
echo "######## Installed OS Distribution #########" >> ${DEBUG_LOG}
|
||||||
|
@ -138,7 +151,7 @@ ip_check() {
|
||||||
GATEWAY6=$(ip -6 r | grep default | cut -d ' ' -f 3)
|
GATEWAY6=$(ip -6 r | grep default | cut -d ' ' -f 3)
|
||||||
if [[ $? = 0 ]]; then
|
if [[ $? = 0 ]]; then
|
||||||
echo "::: Pinging default IPv6 gateway..."
|
echo "::: Pinging default IPv6 gateway..."
|
||||||
GATEWAY6_CHECK=$(ping6 -q -w 3 -c 3 -n "${GATEWAY6}" | tail -n3)
|
GATEWAY6_CHECK=$(ping6 -q -w 3 -c 3 -n "${GATEWAY6}""${piholeInterface}" | tail -n3)
|
||||||
if [[ $? = 0 ]]; then
|
if [[ $? = 0 ]]; then
|
||||||
echo "IPv6 Gateway check:" >> ${DEBUG_LOG}
|
echo "IPv6 Gateway check:" >> ${DEBUG_LOG}
|
||||||
else
|
else
|
||||||
|
@ -146,7 +159,7 @@ ip_check() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "::: Pinging Internet via IPv6..."
|
echo "::: Pinging Internet via IPv6..."
|
||||||
GATEWAY6_CHECK=$(ping6 -q -w 3 -c 3 -n 2001:4860:4860::8888 | tail -n3)
|
GATEWAY6_CHECK=$(ping6 -q -w 3 -c 3 -n 2001:4860:4860::8888"${piholeInterface}" | tail -n3)
|
||||||
if [[ $? = 0 ]]; then
|
if [[ $? = 0 ]]; then
|
||||||
echo "IPv6 Internet check:" >> ${DEBUG_LOG}
|
echo "IPv6 Internet check:" >> ${DEBUG_LOG}
|
||||||
else
|
else
|
||||||
|
@ -190,8 +203,8 @@ portCheck() {
|
||||||
|
|
||||||
echo "::: Detecting local server port 80 and 53 processes."
|
echo "::: Detecting local server port 80 and 53 processes."
|
||||||
|
|
||||||
${SUDO} lsof -i :80 >> ${DEBUG_LOG}
|
lsof -i :80 >> ${DEBUG_LOG}
|
||||||
${SUDO} lsof -i :53 >> ${DEBUG_LOG}
|
lsof -i :53 >> ${DEBUG_LOG}
|
||||||
echo >> ${DEBUG_LOG}
|
echo >> ${DEBUG_LOG}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -266,7 +279,7 @@ checkProcesses() {
|
||||||
echo "" >> ${DEBUG_LOG}
|
echo "" >> ${DEBUG_LOG}
|
||||||
echo -n "${i}" >> "${DEBUG_LOG}"
|
echo -n "${i}" >> "${DEBUG_LOG}"
|
||||||
echo " processes status:" >> ${DEBUG_LOG}
|
echo " processes status:" >> ${DEBUG_LOG}
|
||||||
${SUDO} systemctl -l status "${i}" >> "${DEBUG_LOG}"
|
systemctl -l status "${i}" >> "${DEBUG_LOG}"
|
||||||
done
|
done
|
||||||
echo >> ${DEBUG_LOG}
|
echo >> ${DEBUG_LOG}
|
||||||
}
|
}
|
||||||
|
@ -304,6 +317,7 @@ debugLighttpd() {
|
||||||
### END FUNCTIONS ###
|
### END FUNCTIONS ###
|
||||||
|
|
||||||
version_check
|
version_check
|
||||||
|
files_check
|
||||||
distro_check
|
distro_check
|
||||||
ip_check
|
ip_check
|
||||||
hostnameCheck
|
hostnameCheck
|
||||||
|
|
Loading…
Reference in New Issue