mirror of
https://github.com/pi-hole/pi-hole
synced 2024-12-22 23:08:07 +00:00
Revert "Ensure any changes to blocking page are updated."
This commit is contained in:
parent
a928cd3fa1
commit
89fd962615
@ -35,7 +35,7 @@ IPV4_ADDRESS=""
|
|||||||
IPV6_ADDRESS=""
|
IPV6_ADDRESS=""
|
||||||
QUERY_LOGGING=true
|
QUERY_LOGGING=true
|
||||||
INSTALL_WEB=true
|
INSTALL_WEB=true
|
||||||
CUSTOMBLOCKPAGE=false
|
|
||||||
|
|
||||||
# Find the rows and columns will default to 80x24 is it can not be detected
|
# Find the rows and columns will default to 80x24 is it can not be detected
|
||||||
screen_size=$(stty size 2>/dev/null || echo 24 80)
|
screen_size=$(stty size 2>/dev/null || echo 24 80)
|
||||||
@ -866,28 +866,44 @@ CreateLogFile() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
installPiholeWeb() {
|
installPiholeWeb() {
|
||||||
|
|
||||||
if [ -f ${setupVars} ]; then
|
|
||||||
. ${setupVars}
|
|
||||||
fi
|
|
||||||
# Install the web interface
|
# Install the web interface
|
||||||
echo ":::"
|
echo ":::"
|
||||||
|
echo "::: Installing pihole custom index page..."
|
||||||
if [[ ${CUSTOMBLOCKPAGE} == false ]]; then
|
if [ -d "/var/www/html/pihole" ]; then
|
||||||
echo -n "::: Installing block page..."
|
if [ -f "/var/www/html/pihole/index.php" ]; then
|
||||||
install -d /var/www/html/pihole
|
echo "::: Existing index.php detected, not overwriting"
|
||||||
install -D ${PI_HOLE_LOCAL_REPO}/advanced/{index,blockingpage}.* /var/www/html/pihole/
|
|
||||||
echo " done!"
|
|
||||||
else
|
else
|
||||||
echo "::: Custom block page detected... not overwriting!"
|
echo -n "::: index.php missing, replacing... "
|
||||||
|
cp ${PI_HOLE_LOCAL_REPO}/advanced/index.php /var/www/html/pihole/
|
||||||
|
echo " done!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -n "::: Backing up default lighttpd index page..."
|
if [ -f "/var/www/html/pihole/index.js" ]; then
|
||||||
|
echo "::: Existing index.js detected, not overwriting"
|
||||||
|
else
|
||||||
|
echo -n "::: index.js missing, replacing... "
|
||||||
|
cp ${PI_HOLE_LOCAL_REPO}/advanced/index.js /var/www/html/pihole/
|
||||||
|
echo " done!"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f "/var/www/html/pihole/blockingpage.css" ]; then
|
||||||
|
echo "::: Existing blockingpage.css detected, not overwriting"
|
||||||
|
else
|
||||||
|
echo -n "::: blockingpage.css missing, replacing... "
|
||||||
|
cp ${PI_HOLE_LOCAL_REPO}/advanced/blockingpage.css /var/www/html/pihole
|
||||||
|
echo " done!"
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
echo "::: Creating directory for blocking page"
|
||||||
|
install -d /var/www/html/pihole
|
||||||
|
install -D ${PI_HOLE_LOCAL_REPO}/advanced/{index,blockingpage}.* /var/www/html/pihole/
|
||||||
if [ -f /var/www/html/index.lighttpd.html ]; then
|
if [ -f /var/www/html/index.lighttpd.html ]; then
|
||||||
mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
|
mv /var/www/html/index.lighttpd.html /var/www/html/index.lighttpd.orig
|
||||||
echo " done!"
|
|
||||||
else
|
else
|
||||||
echo " No default index.lighttpd.html file found... not backing up"
|
printf "\n:::\tNo default index.lighttpd.html file found... not backing up"
|
||||||
|
fi
|
||||||
|
echo " done!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Install Sudoer file
|
# Install Sudoer file
|
||||||
|
Loading…
Reference in New Issue
Block a user