Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1611 from pi-hole/developmentNew

Browse source 
Sort out Merge conflicts with master
This commit is contained in:
Adam Warner 2017-07-17 14:49:55 +01:00 committed by GitHub
commit 0a062d26e6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
advanced/Scripts/piholeDebug.sh
View file

@ -598,7 +598,7 @@ compare_port_to_service_assigned() {
# The programs we use may change at some point, so they are in a varible here # The programs we use may change at some point, so they are in a varible here
local resolver="dnsmasq" local resolver="dnsmasq"
local web_server="lighttpd" local web_server="lighttpd"
local ftl="pihole-FT" local ftl="pihole-FTL"
if [[ "${service_name}" == "${resolver}" ]] || [[ "${service_name}" == "${web_server}" ]] || [[ "${service_name}" == "${ftl}" ]]; then if [[ "${service_name}" == "${resolver}" ]] || [[ "${service_name}" == "${web_server}" ]] || [[ "${service_name}" == "${ftl}" ]]; then
# if port 53 is dnsmasq, show it in green as it's standard # if port 53 is dnsmasq, show it in green as it's standard
log_write "[${COL_LIGHT_GREEN}${port_number}${COL_NC}] is in use by ${COL_LIGHT_GREEN}${service_name}${COL_NC}" log_write "[${COL_LIGHT_GREEN}${port_number}${COL_NC}] is in use by ${COL_LIGHT_GREEN}${service_name}${COL_NC}"
@ -615,7 +615,7 @@ check_required_ports() {
# so we can detect any issues # so we can detect any issues
local resolver="dnsmasq" local resolver="dnsmasq"
local web_server="lighttpd" local web_server="lighttpd"
local ftl="pihole-FT" local ftl="pihole-FTL"
# Create an array for these ports in use # Create an array for these ports in use
ports_in_use=() ports_in_use=()
# Sort the addresses and remove duplicates # Sort the addresses and remove duplicates