docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1028 from pi-hole/revert-1009-dev_origin 

Revert "Dev origin: enable lighttpd-mod-ssl in lighttpd when based on debian:bullseye"
This commit is contained in:
Adam Warner 2022-03-28 22:05:38 +01:00 committed by GitHub
parent 99dc2e0952 099f81b2d2
commit b5e656491e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install.sh
View File

@ -69,12 +69,6 @@ sed -i $'s/)\s*uninstallFunc/) unsupportedFunc/g' /usr/local/bin/pihole
# pihole -r / pihole reconfigure
sed -i $'s/)\s*reconfigurePiholeFunc/) unsupportedFunc/g' /usr/local/bin/pihole
#enable ssl mod ssl if needed (debian:billseye)
if [ -z "$(compgen -G /etc/lighttpd/conf-enabled/*-ssl.conf)" ]; then
apt-get update && apt-get install -y --no-install-recommends lighttpd-mod-openssl
lighty-enable-mod ssl
fi
if [[ "${PIHOLE_DOCKER_TAG}" != "dev" && "${PIHOLE_DOCKER_TAG}" != "nightly" ]]; then
# If we are on a version other than dev or nightly, disable `pihole checkout`, otherwise it is useful to have for quick troubleshooting sometimes
sed -i $'s/)\s*piholeCheckoutFunc/) unsupportedFunc/g' /usr/local/bin/pihole

9
s6/debian-root/etc/cont-init.d/20-start.sh
View File

@ -36,13 +36,4 @@ fi
pihole -v
# generate default certificate if needed
if [ ! -e /etc/lighttpd/server.pem ]; then
echo "Generating a ssl certificate for lighttpd."
openssl req -x509 -newkey rsa:4096 -nodes -keyout /etc/lighttpd/key.pem -out /etc/lighttpd/certificate.pem -sha256 -days 3650 -subj "/C=US/ST=Oregon/L=Portland/O=Company Name/OU=Org/CN=www.example.com"
cat /etc/lighttpd/certificate.pem /etc/lighttpd/key.pem > /etc/lighttpd/server.pem
chown -R www-data:www-data /etc/lighttpd
chmod 0600 /etc/lighttpd/*.pem
fi
echo " Container tag is: ${PIHOLE_DOCKER_TAG}"