gaspersic/pi-hole
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Incorporates changes requested by @Mcat12

Browse Source 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
This commit is contained in:
pvogt09
2019-05-01 11:20:26 +02:00
parent 5c575e73c7
commit 8a92fb24c4
8 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
automated install/basic-install.sh
View File

@@ -1242,7 +1242,7 @@ version_check_dnsmasq() {
printf " %b Restoring default dnsmasq.conf..." "${INFO}"
# and replace it with the default
cp -p ${dnsmasq_original_config} ${dnsmasq_conf}
chmod a+r ${dnsmasq_conf}
chmod 644 ${dnsmasq_conf}
printf "%b %b Restoring default dnsmasq.conf...\\n" "${OVER}" "${TICK}"
# Otherwise,
else
@@ -1265,7 +1265,7 @@ version_check_dnsmasq() {
fi
# Copy the new Pi-hole DNS config file into the dnsmasq.d directory
cp ${dnsmasq_pihole_01_snippet} ${dnsmasq_pihole_01_location}
chmod a+r ${dnsmasq_pihole_01_location}
chmod 644 ${dnsmasq_pihole_01_location}
printf "%b %b Copying 01-pihole.conf to /etc/dnsmasq.d/01-pihole.conf\\n" "${OVER}" "${TICK}"
# Replace our placeholder values with the GLOBAL DNS variables that we populated earlier
# First, swap in the interface to listen on
@@ -1393,10 +1393,10 @@ installConfigs() {
fi
# and copy in the config file Pi-hole needs
cp ${PI_HOLE_LOCAL_REPO}/advanced/${LIGHTTPD_CFG} /etc/lighttpd/lighttpd.conf
chmod a+r /etc/lighttpd/lighttpd.conf
chmod 644 /etc/lighttpd/lighttpd.conf
# Make sure the external.conf file exists, as lighttpd v1.4.50 crashes without it
touch /etc/lighttpd/external.conf
chmod a+r /etc/lighttpd/external.conf
chmod 644 /etc/lighttpd/external.conf
# if there is a custom block page in the html/pihole directory, replace 404 handler in lighttpd config
if [[ -f "${PI_HOLE_BLOCKPAGE_DIR}/custom.php" ]]; then
sed -i 's/^\(server\.error-handler-404\s*=\s*\).*$/\1"pihole\/custom\.php"/' /etc/lighttpd/lighttpd.conf
@@ -1428,26 +1428,20 @@ install_manpage() {
if [[ ! -d "/usr/local/share/man/man8" ]]; then
# if not present, create man8 directory
mkdir /usr/local/share/man/man8
chown root:staff /usr/local/share/man/man8
chmod a+r /usr/local/share/man/man8
chmod a+x /usr/local/share/man/man8
chmod g+s /usr/local/share/man/man8
chmod 755 /usr/local/share/man/man8
fi
if [[ ! -d "/usr/local/share/man/man5" ]]; then
# if not present, create man5 directory
mkdir /usr/local/share/man/man5
chown root:staff /usr/local/share/man/man5
chmod a+r /usr/local/share/man/man5
chmod a+x /usr/local/share/man/man5
chmod g+s /usr/local/share/man/man5
chmod 755 /usr/local/share/man/man5
fi
# Testing complete, copy the files & update the man db
cp ${PI_HOLE_LOCAL_REPO}/manpages/pihole.8 /usr/local/share/man/man8/pihole.8
chmod a+r /usr/local/share/man/man8/pihole.8
chmod 644 /usr/local/share/man/man8/pihole.8
cp ${PI_HOLE_LOCAL_REPO}/manpages/pihole-FTL.8 /usr/local/share/man/man8/pihole-FTL.8
chmod a+r /usr/local/share/man/man8/pihole-FTL.8
chmod 644 /usr/local/share/man/man8/pihole-FTL.8
cp ${PI_HOLE_LOCAL_REPO}/manpages/pihole-FTL.conf.5 /usr/local/share/man/man5/pihole-FTL.conf.5
chmod a+r /usr/local/share/man/man5/pihole-FTL.conf.5
chmod 644 /usr/local/share/man/man5/pihole-FTL.conf.5
if mandb -q &>/dev/null; then
# Updated successfully
printf "%b %b man pages installed and database updated\\n" "${OVER}" "${TICK}"
@@ -1838,7 +1832,7 @@ finalExports() {
echo "INSTALL_WEB_INTERFACE=${INSTALL_WEB_INTERFACE}"
echo "LIGHTTPD_ENABLED=${LIGHTTPD_ENABLED}"
}>> "${setupVars}"
chmod 744 "${setupVars}"
chmod 644 "${setupVars}"
# Set the privacy level
sed -i '/PRIVACYLEVEL/d' "${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf"
@@ -1862,7 +1856,7 @@ installLogrotate() {
printf "\\n %b %s..." "${INFO}" "${str}"
# Copy the file over from the local repo
cp ${PI_HOLE_LOCAL_REPO}/advanced/Templates/logrotate /etc/pihole/logrotate
chmod a+r /etc/pihole/logrotate
chmod 644 /etc/pihole/logrotate
# Different operating systems have different user / group
# settings for logrotate that makes it impossible to create
# a static logrotate file that will work with e.g.
@@ -2453,7 +2447,7 @@ copy_to_install_log() {
# Copy the contents of file descriptor 3 into the install log
# Since we use color codes such as '\e[1;33m', they should be removed
sed 's/\[[0-9;]\{1,5\}m//g' < /proc/$$/fd/3 > "${installLogLoc}"
chmod a+r "${installLogLoc}"
chmod 644 "${installLogLoc}"
}
main() {
@@ -2539,8 +2533,7 @@ main() {
welcomeDialogs
# Create directory for Pi-hole storage
mkdir -p /etc/pihole/
chmod a+r /ect/pihole/
chmod a+x /etc/pihole/
chmod 755 /ect/pihole/
# Determine available interfaces
get_available_interfaces
# Find interfaces and let the user choose one