# Provide information on what they should do with their token
# Provide information on what they should do with their token
log_write " * The debug log can be uploaded to tricorder.pi-hole.net for sharing with developers only."
log_write " * The debug log can be uploaded to tricorder.pi-hole.net for sharing with developers only."
# If pihole -d is running automatically (usually through the dashboard)
# If pihole -d is running automatically
if[["${AUTOMATED}"]];then
if[["${AUTOMATED}"]];then
# let the user know
# let the user know
log_write "${INFO} Debug script running in automated mode"
log_write "${INFO} Debug script running in automated mode"
@ -1396,16 +1395,19 @@ upload_to_tricorder() {
curl_to_tricorder
curl_to_tricorder
# If we're not running in automated mode,
# If we're not running in automated mode,
else
else
echo""
# if not being called from the web interface
# give the user a choice of uploading it or not
if[[ ! "${WEBCALL}"]];then
# Users can review the log file locally (or the output of the script since they are the same) and try to self-diagnose their problem
echo""
read -r -p "[?] Would you like to upload the log? [y/N] " response
# give the user a choice of uploading it or not
case${response} in
# Users can review the log file locally (or the output of the script since they are the same) and try to self-diagnose their problem
# If they say yes, run our function for uploading the log
read -r -p "[?] Would you like to upload the log? [y/N] " response
[yY][eE][sS]|[yY]) curl_to_tricorder;;
case${response} in
# If they choose no, just exit out of the script
# If they say yes, run our function for uploading the log
*) log_write " * Log will ${COL_GREEN}NOT${COL_NC} be uploaded to tricorder.\\n * A local copy of the debug log can be found at: ${COL_CYAN}${PIHOLE_DEBUG_LOG}${COL_NC}\\n";exit;
[yY][eE][sS]|[yY]) curl_to_tricorder;;
esac
# If they choose no, just exit out of the script
*) log_write " * Log will ${COL_GREEN}NOT${COL_NC} be uploaded to tricorder.\\n * A local copy of the debug log can be found at: ${COL_CYAN}${PIHOLE_DEBUG_LOG}${COL_NC}\\n";exit;
esac
fi
fi
fi
# Check if tricorder.pi-hole.net is reachable and provide token
# Check if tricorder.pi-hole.net is reachable and provide token
# along with some additional useful information
# along with some additional useful information
@ -1425,8 +1427,13 @@ upload_to_tricorder() {
# If no token was generated
# If no token was generated
else
else
# Show an error and some help instructions
# Show an error and some help instructions
log_write "${CROSS}${COL_RED}There was an error uploading your debug log.${COL_NC}"
# Skip this if being called from web interface and autmatic mode was not chosen (users opt-out to upload)
log_write " * Please try again or contact the Pi-hole team for assistance."
if[["${WEBCALL}"]]&&[[ ! "${AUTOMATED}"]];then
:
else
log_write "${CROSS}${COL_RED}There was an error uploading your debug log.${COL_NC}"
log_write " * Please try again or contact the Pi-hole team for assistance."
fi
fi
fi
# Finally, show where the log file is no matter the outcome of the function so users can look at it
# Finally, show where the log file is no matter the outcome of the function so users can look at it
log_write " * A local copy of the debug log can be found at: ${COL_CYAN}${PIHOLE_DEBUG_LOG}${COL_NC}\\n"
log_write " * A local copy of the debug log can be found at: ${COL_CYAN}${PIHOLE_DEBUG_LOG}${COL_NC}\\n"
sed -i 's/^\(server\.error-handler-404\s*=\s*\).*$/\1"pihole\/custom\.php"/' "${lighttpdConfig}"
sed -i 's/^\(server\.error-handler-404\s*=\s*\).*$/\1"\/pihole\/custom\.php"/' "${lighttpdConfig}"
fi
fi
# Make the directories if they do not exist and set the owners
# Make the directories if they do not exist and set the owners
mkdir -p /run/lighttpd
mkdir -p /run/lighttpd
@ -1731,7 +1731,7 @@ finalExports() {
# If the setup variable file exists,
# If the setup variable file exists,
if[[ -e "${setupVars}"]];then
if[[ -e "${setupVars}"]];then
# update the variables in the file
# update the variables in the file
sed -i.update.bak '/PIHOLE_INTERFACE/d;/IPV4_ADDRESS/d;/IPV6_ADDRESS/d;/PIHOLE_DNS_1\b/d;/PIHOLE_DNS_2\b/d;/QUERY_LOGGING/d;/INSTALL_WEB_SERVER/d;/INSTALL_WEB_INTERFACE/d;/LIGHTTPD_ENABLED/d;/CACHE_SIZE/d;/DNS_FQDN_REQUIRED/d;/DNS_BOGUS_PRIV/d;' "${setupVars}"
sed -i.update.bak '/PIHOLE_INTERFACE/d;/IPV4_ADDRESS/d;/IPV6_ADDRESS/d;/PIHOLE_DNS_1\b/d;/PIHOLE_DNS_2\b/d;/QUERY_LOGGING/d;/INSTALL_WEB_SERVER/d;/INSTALL_WEB_INTERFACE/d;/LIGHTTPD_ENABLED/d;/CACHE_SIZE/d;/DNS_FQDN_REQUIRED/d;/DNS_BOGUS_PRIV/d;/DNSMASQ_LISTENING/d;' "${setupVars}"
Adam Warner
2 years ago
committed by