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

Resolve merge confict

Browse Source
This commit is contained in:
Dan Schaper
2015-12-06 20:22:34 -08:00
parent 723c2d47bb b261e046bb
commit d215fa9ade
4 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
advanced/dnsmasq.conf
View File

@@ -18,7 +18,7 @@ bogus-priv
# uncomment this.
no-resolv
# Add other name servers here, with domain specs if they are for
# Add other name servers here, with domain specs if they are for
# non-public domains.
server=8.8.8.8
server=8.8.4.4
@@ -26,7 +26,7 @@ server=8.8.4.4
# If you want dnsmasq to listen for DHCP and DNS requests only on
# specified interfaces (and the loopback) give the name of the
# interface (eg eth0) here.
interface=eth0
interface=@INT@
# Or which to listen on by address (remember to include 127.0.0.1 if
# you use this.)
listen-address=127.0.0.1
@@ -45,3 +45,6 @@ log-facility=/var/log/pihole.log
# server for potentially stale date, you can set a time-to-live (in
# seconds) here.
local-ttl=300
# This allows it to continue functioning without being blocked by syslog, and allows syslog to use dnsmasq for DNS queries without risking deadlock
log-async