|
|
|
@ -1589,7 +1589,7 @@ updatePihole() {
|
|
|
|
|
# Install base files and web interface
|
|
|
|
|
installScripts
|
|
|
|
|
# Install config files
|
|
|
|
|
installConfigs
|
|
|
|
|
installConfigs
|
|
|
|
|
# If the user wants to install the dasboard,
|
|
|
|
|
if [[ "${INSTALL_WEB}" == true ]]; then
|
|
|
|
|
# do so
|
|
|
|
@ -1755,7 +1755,9 @@ FTLinstall() {
|
|
|
|
|
pushd "$(mktemp -d)" > /dev/null || { echo "Unable to make temporary directory for FTL binary download"; return 1; }
|
|
|
|
|
|
|
|
|
|
# Always replace pihole-FTL.service
|
|
|
|
|
install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/pihole-FTL.service" "/etc/init.d/pihole-FTL"
|
|
|
|
|
install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/pihole-FTL.service" "/etc/systemd/system/pihole-FTL.service"
|
|
|
|
|
# Enable service script (we have to do this after replacing the service unit)
|
|
|
|
|
systemctl enable pihole-FTL.service
|
|
|
|
|
|
|
|
|
|
local ftlBranch
|
|
|
|
|
local url
|
|
|
|
@ -1786,6 +1788,8 @@ FTLinstall() {
|
|
|
|
|
stop_service pihole-FTL &> /dev/null
|
|
|
|
|
# Install the new version with the correct permissions
|
|
|
|
|
install -T -m 0755 "${binary}" /usr/bin/pihole-FTL
|
|
|
|
|
# Set net admin permissions so that FTL can serve DNS, DHCP and IMAP (for DHCPv6)
|
|
|
|
|
setcap CAP_NET_BIND_SERVICE,CAP_NET_RAW,CAP_NET_ADMIN+eip "/usr/bin/pihole-FTL"
|
|
|
|
|
# Move back into the original directory the user was in
|
|
|
|
|
popd > /dev/null || { echo "Unable to return to original directory after FTL binary download."; return 1; }
|
|
|
|
|
# Install the FTL service
|
|
|
|
|