arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity

Fixed intentation and corrected comments.

Browse Source 
Signed-off-by: RamSet <RamSet@gmail.com>
This commit is contained in:
RamSet 2018-07-17 17:56:13 -06:00
parent 56b04017e7
commit 3098f32a07
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
automated install/basic-install.sh
View File

@ -37,9 +37,9 @@ setupVars=/etc/pihole/setupVars.conf
lighttpdConfig=/etc/lighttpd/lighttpd.conf lighttpdConfig=/etc/lighttpd/lighttpd.conf
# This is a file used for the colorized output # This is a file used for the colorized output
coltable=/opt/pihole/COL_TABLE coltable=/opt/pihole/COL_TABLE
# Defining a numeric variable for tracking presence of dnsmasq # Defining a boolean variable for tracking presence of dnsmasq
dnsmasq_flag=false dnsmasq_flag=false
# Defining a numeric variable for tracking presence of systemd-resolved # Defining a boolean variable for tracking presence of systemd-resolved
systemd_resolved_flag=false systemd_resolved_flag=false
# We store several other folders and # We store several other folders and
@ -1472,17 +1472,17 @@ disable_resolved_stublistener() {
# Check if DNSStubListener is enabled # Check if DNSStubListener is enabled
echo -e " ${INFO} Testing if systemd-resolved DNSStub-Listener is active" echo -e " ${INFO} Testing if systemd-resolved DNSStub-Listener is active"
if ( grep -E '#?DNSStubListener=yes' /etc/systemd/resolved.conf &> /dev/null ); then if ( grep -E '#?DNSStubListener=yes' /etc/systemd/resolved.conf &> /dev/null ); then
# Disable the DNSStubListener to unbind it from port 53 # Disable the DNSStubListener to unbind it from port 53
# Note that this breaks dns functionality on host until dnsmasq/ftl are up and running # Note that this breaks dns functionality on host until dnsmasq/ftl are up and running
echo -e " ${TICK} Disabling systemd-resolved DNSStubListener" echo -e " ${TICK} Disabling systemd-resolved DNSStubListener"
# Make a backup of the original /etc/systemd/resolved.conf # Make a backup of the original /etc/systemd/resolved.conf
# (This will need to be restored on uninstallation) # (This will need to be restored on uninstallation)
${SUDO} sed -r -i.orig 's/#?DNSStubListener=yes/DNSStubListener=no/g' /etc/systemd/resolved.conf ${SUDO} sed -r -i.orig 's/#?DNSStubListener=yes/DNSStubListener=no/g' /etc/systemd/resolved.conf
echo -e " ${TICK} Restarting systemd-resolved DNSStubListener" echo -e " ${TICK} Restarting systemd-resolved DNSStubListener"
${SUDO} systemctl reload-or-restart systemd-resolved ${SUDO} systemctl reload-or-restart systemd-resolved
else else
echo -e " ${INFO} Systemd-resolved does not need to be restarted" echo -e " ${INFO} Systemd-resolved does not need to be restarted"
echo -e " ${INFO} DNSStubListener is not enabled" echo -e " ${INFO} DNSStubListener is not enabled"
fi fi
else else
echo -e " ${INFO} Systemd-resolved is not enabled" echo -e " ${INFO} Systemd-resolved is not enabled"
@ -1507,19 +1507,19 @@ disable_dnsmasq() {
echo -e " ${INFO} Disabling dnsmasq via systemctl" echo -e " ${INFO} Disabling dnsmasq via systemctl"
${SUDO} systemctl disable dnsmasq &> /dev/null ${SUDO} systemctl disable dnsmasq &> /dev/null
fi fi
#setting dnsmasq_flag to false in order for the next check to validate or not #setting dnsmasq_flag to false in order for the next check to validate or not
dnsmasq_flag=false dnsmasq_flag=false
echo -e " ${INFO} Checking if dnsmasq is still running" echo -e " ${INFO} Checking if dnsmasq is still running"
silent_port_53_check silent_port_53_check
if [[ $dnsmasq_flag = "true" ]]; then if [[ $dnsmasq_flag = "true" ]]; then
echo -e " ${EXCL} dnsmasq still active, this is most likely due to the fact that ${COL_LIGHT_RED}dnsmasq" echo -e " ${EXCL} dnsmasq still active, this is most likely due to the fact that ${COL_LIGHT_RED}dnsmasq"
echo -e " was loaded via a non convetional method. This might cause future conflicts with FTLDNS${COL_NC}" echo -e " was loaded via a non convetional method. This might cause future conflicts with FTLDNS${COL_NC}"
${SUDO} pkill dnsmasq ${SUDO} pkill dnsmasq
echo -e " ${TICK} dnsmasq process killed" echo -e " ${TICK} dnsmasq process killed"
fi fi
else else
echo -e " ${INFO} dnsmasq is not enabled" echo -e " ${INFO} dnsmasq is not enabled"
fi fi
} }
update_package_cache() { update_package_cache() {