mirror of
https://github.com/pi-hole/pi-hole
synced 2025-01-07 22:50:56 +00:00
Improve lighttpd disabling (#5849)
This commit is contained in:
commit
6e633e4cfd
@ -2279,6 +2279,11 @@ copy_to_install_log() {
|
||||
}
|
||||
|
||||
disableLighttpd() {
|
||||
# Return early when lighttpd is not active
|
||||
if ! check_service_active lighttpd; then
|
||||
return
|
||||
fi
|
||||
|
||||
local response
|
||||
# Detect if the terminal is interactive
|
||||
if [[ -t 0 ]]; then
|
||||
@ -2323,6 +2328,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}"
|
||||
@ -2514,9 +2522,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.
|
||||
|
Loading…
Reference in New Issue
Block a user