arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-05 05:30:55 +00:00
Code Issues Releases Wiki Activity

Ensure Yes to keeping lighttpd doesn't trigger set -e during the upgrade

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2024-12-30 15:35:41 +01:00
parent 50645c2924
commit 1835827371
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
automated install/basic-install.sh
View File

@ -2301,13 +2301,13 @@ copy_to_install_log() {
} }
disableLighttpd() { disableLighttpd() {
local response
# Detect if the terminal is interactive # Detect if the terminal is interactive
if [[ -t 0 ]]; then if [[ -t 0 ]]; then
# The terminal is interactive # The terminal is interactive
dialog --no-shadow --keep-tite \ dialog --no-shadow --keep-tite \
--title "Pi-hole v6.0 no longer uses lighttpd" \ --title "Pi-hole v6.0 no longer uses lighttpd" \
--yesno "\\n\\nPi-hole v6.0 has its own embedded web server so lighttpd is no longer needed *unless* you have custom configurations.\\n\\nIn this case, you can opt-out of disabling lighttpd and pihole-FTL will try to bind to an alternative port such as 8080.\\n\\nDo you want to disable lighttpd (recommended)?" "${r}" "${c}" --yesno "\\n\\nPi-hole v6.0 has its own embedded web server so lighttpd is no longer needed *unless* you have custom configurations.\\n\\nIn this case, you can opt-out of disabling lighttpd and pihole-FTL will try to bind to an alternative port such as 8080.\\n\\nDo you want to disable lighttpd (recommended)?" "${r}" "${c}" && response=0 || response="$?"
response=$?
else else
# The terminal is non-interactive, assume yes. Lighttpd will be stopped # The terminal is non-interactive, assume yes. Lighttpd will be stopped
# but keeps being installed and can easily be re-enabled by the user # but keeps being installed and can easily be re-enabled by the user