Sync master back into development (#5166)

This commit is contained in:
Adam Warner 2023-02-21 20:03:27 +00:00 committed by GitHub
commit b9f19fc357
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1409,7 +1409,7 @@ installConfigs() {
mkdir -p /run/lighttpd
chown ${LIGHTTPD_USER}:${LIGHTTPD_GROUP} /run/lighttpd
if grep -q -F "FILE WILL BE OVERWRITTEN BY PI-HOLE" "${lighttpdConfig}"; then
if grep -q -F "OVERWRITTEN BY PI-HOLE" "${lighttpdConfig}"; then
# Attempt to preserve backwards compatibility with older versions
install -D -m 644 -T ${PI_HOLE_LOCAL_REPO}/advanced/${LIGHTTPD_CFG} "${lighttpdConfig}"
# Make the directories if they do not exist and set the owners