Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2026-04-20 08:49:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further simplifications

Browse Source 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2020-12-16 22:19:20 +00:00
parent f77e4609ce
commit 0cb7324a60
2 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bash_functions.sh
View File

@@ -66,16 +66,6 @@ validate_env() {
fi;
}
setup_dnsmasq_dns() {
. /opt/pihole/webpage.sh
local DNS1="8.8.8.8"
local DNS2="8.8.4.4"
echo "Configuring default DNS servers: $DNS1 & $DNS2"
change_setting "PIHOLE_DNS_1" "${DNS1}"
change_setting "PIHOLE_DNS_2" "${DNS2}"
}
setup_dnsmasq_interface() {
local interface="${1:-eth0}"
local interfaceType='default'
@@ -102,12 +92,10 @@ setup_dnsmasq_config_if_missing() {
}
setup_dnsmasq() {
local USE_DEFAULT_DNS_SERVERS="$1"
local interface="$2"
local dnsmasq_listening_behaviour="$3"
local interface="$1"
local dnsmasq_listening_behaviour="$2"
# Coordinates
setup_dnsmasq_config_if_missing
[ $USE_DEFAULT_DNS_SERVERS -eq 1 ] && setup_dnsmasq_dns
setup_dnsmasq_interface "$interface"
setup_dnsmasq_listening_behaviour "$dnsmasq_listening_behaviour"
setup_dnsmasq_user "${DNSMASQ_USER}"