1
0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-07 22:50:56 +00:00

SHow lighttpd disable dialog only once during v6 migration and when lighttpd is actually installed

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2025-01-01 18:55:49 +01:00
parent b0e0bdc436
commit 79087fb252
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD

View File

@ -2301,6 +2301,11 @@ copy_to_install_log() {
}
disableLighttpd() {
# Return early when lighttpd is not installed
if [[ ! -f /etc/lighttpd/lighttpd.conf ]]; then
return
fi
local response
# Detect if the terminal is interactive
if [[ -t 0 ]]; then
@ -2345,6 +2350,9 @@ migrate_dnsmasq_configs() {
return 0
fi
# Disable lighttpd server during v6 migration
disableLighttpd
# Create target directory /etc/pihole/migration_backup_v6
# and make it owned by pihole:pihole
mkdir -p "${V6_CONF_MIGRATION_DIR}"
@ -2536,9 +2544,6 @@ main() {
# but before starting or resttarting the ftl service
disable_resolved_stublistener
# Disable lighttpd server
disableLighttpd
# Check if gravity database needs to be upgraded. If so, do it without rebuilding
# gravity altogether. This may be a very long running task needlessly blocking
# the update process.