Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-26 01:00:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf

Browse source
This commit is contained in:
Dan Schaper 2018-07-30 14:32:29 -07:00 • committed by GitHub
commit 06875f2cc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
automated install/basic-install.sh
View file

@ -51,6 +51,7 @@ PI_HOLE_CONFIG_DIR="/etc/pihole"
useUpdateVars=false
adlistFile="/etc/pihole/adlists.list"
regexFile="/etc/pihole/regex.list"
# Pi-hole needs an IP address; to begin, these variables are empty since we don't know what the IP is until
# this script can run
IPV4_ADDRESS=""
@ -1243,6 +1244,11 @@ installConfigs() {
return 1
fi
fi
# Install an empty regex file
if [[ ! -f "${regexFile}" ]]; then
# Let PHP edit the regex file, if installed
install -o pihole -g "${LIGHTTPD_GROUP:-pihole}" -m 664 /dev/null "${regexFile}"
fi
# If the user chose to install the dashboard,
if [[ "${INSTALL_WEB_SERVER}" == true ]]; then
# and if the Web server conf directory does not exist,