From 512f610afa1da71a01daba209ca545b32e7504cd Mon Sep 17 00:00:00 2001 From: MichaIng Date: Sun, 24 Jan 2021 14:54:19 +0100 Subject: [PATCH 1/2] Skip full distro check on start The distro_check function includes updating the APT cache, checking for dependencies, which is both not required on Docker start where all required packages are installed already. The only required steps from this function is the webserver user and config file names, which can be applied directly instead since we know that the Pi-hole Docker container is based on Debian. Furthermore this solves the issue that updating the APT cache fails, when Pi-hole itself is used for DNS resolution, since pihole-FTL has not yet been started at this stage. That failure was not visible since "apt-get update" does not exist with error code (currently) when facing DNS resolving issues, even if not a single list could have been updated, and no other step is done that would require DNS resolving, until pihole-FTL is started. For a regular (non-Docker) install or update it is however reasonable to error out directly when the APT cache could not have been updated, to not defer the exit unnecessarily to a harder-to-debug stage. Signed-off-by: MichaIng --- bash_functions.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bash_functions.sh b/bash_functions.sh index 92e9d1d..520c5b0 100644 --- a/bash_functions.sh +++ b/bash_functions.sh @@ -14,7 +14,10 @@ fix_capabilities() { prepare_configs() { # Done in /start.sh, don't do twice PH_TEST=true . $PIHOLE_INSTALL - distro_check + # Set Debian webserver variables for installConfigs + LIGHTTPD_USER="www-data" + LIGHTTPD_GROUP="www-data" + LIGHTTPD_CFG="lighttpd.conf.debian" installConfigs touch "$setupVars" set +e From 0a8d174ef7abbd89af319bf8dc931633ca5d30e5 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 27 Jan 2021 18:11:32 +0000 Subject: [PATCH 2/2] prep for new release --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index cb93305..fef00ac 100644 --- a/install.sh +++ b/install.sh @@ -7,7 +7,7 @@ export CORE_VERSION="$(cat /etc/docker-pi-hole-version)" export WEB_VERSION="${CORE_VERSION}" export PIHOLE_SKIP_OS_CHECK=true # Overwrite WEB_VERSION if core and web versions are different -export WEB_VERSION="v5.3.1" +export WEB_VERSION="v5.3.2" # Only use for pre-production / testing export CHECKOUT_BRANCHES=false