Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-25 14:20:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

pihole -d: Include pihole.toml only once (#5478)

Browse source
This commit is contained in:
DL6ER 2023-11-06 19:46:33 +01:00 committed by GitHub
commit 834e52f15d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
advanced/Scripts/piholeDebug.sh
View file

@ -544,18 +544,6 @@ disk_usage() {
done
}
parse_pihole_toml() {
echo_current_diagnostic "Pi-hole configuration"
# If the file exists,
if [[ -r "${PIHOLE_FTL_CONF_FILE}" ]]; then
# parse it
parse_file "${PIHOLE_FTL_CONF_FILE}"
else
# If not, show an error
log_write "${CROSS} ${COL_RED}Could not read ${PIHOLE_FTL_CONF_FILE}.${COL_NC}"
fi
}
parse_locale() {
local pihole_locale
echo_current_diagnostic "Locale"
@ -1402,10 +1390,6 @@ upload_to_tricorder() {
# Run through all the functions we made
make_temporary_log
initialize_debug
# TODO: Address the reliance on setupVars.conf here. Should debug read pihole.toml directly, or rely on pihole-FTL --config?
# setupVars.conf needs to be sourced before the networking so the values are
# available to the other functions
source_setup_variables
check_component_versions
# check_critical_program_versions
diagnose_operating_system
@ -1419,7 +1403,6 @@ check_name_resolution
check_dhcp_servers
process_status
ftl_full_status
parse_pihole_toml
analyze_ftl_db
analyze_gravity_list
show_groups