restored correct dnsmasq conf including

5 files changed, 51 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7add48389e4d..06decd7f1a97 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pi-hole-standalone
 	pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC.
 	pkgver = 2.9.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/pi-hole/pi-hole
 	install = pi-hole-standalone.install
 	arch = any
@@ -22,7 +22,7 @@ pkgbase = pi-hole-standalone
 	source = mimic_setupVars.conf.sh
 	md5sums = b383a2741e556a3680b3ae312a18cfba
 	md5sums = bc28e67029222243ba2ca9b3a1855469
-	md5sums = 4bba639dcff6dd53c7d73e2fa1079f1f
+	md5sums = c39b31cbad16482630196704167afe2a
 	md5sums = 1b2e808b699a6b58647641f12379f65d
 	md5sums = 047f13d4ac97877f724f87b002aaee63
 	md5sums = d42a864f88299998f8233c0bc0dd093d
diff --git a/PKGBUILD b/PKGBUILD
index 4f8a93563f62..ab26e6118548 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=pi-hole-standalone
 _pkgname=pi-hole
 pkgver=2.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC.'
 arch=('any')
 license=('GPL2')
@@ -25,7 +25,7 @@ source=(https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
 
 md5sums=('b383a2741e556a3680b3ae312a18cfba'
          'bc28e67029222243ba2ca9b3a1855469'
-         '4bba639dcff6dd53c7d73e2fa1079f1f'
+         'c39b31cbad16482630196704167afe2a'
          '1b2e808b699a6b58647641f12379f65d'
          '047f13d4ac97877f724f87b002aaee63'
          'd42a864f88299998f8233c0bc0dd093d'
diff --git a/dnsmasq.complete b/dnsmasq.complete
new file mode 100644
index 000000000000..e520fc63b25c
--- /dev/null
+++ b/dnsmasq.complete
@@ -0,0 +1,43 @@
+# If you want dnsmasq to read another file, as well as /etc/hosts, use
+# this.
+addn-hosts=/etc/pihole/gravity.list
+
+# The following two options make you a better netizen, since they
+# tell dnsmasq to filter out queries which the public DNS cannot
+# answer, and which load the servers (especially the root servers)
+# unnecessarily. If you have a dial-on-demand link they also stop
+# these requests from bringing up the link unnecessarily.
+
+# Never forward plain names (without a dot or domain part)
+domain-needed
+# Never forward addresses in the non-routed address spaces.
+bogus-priv
+
+# If you don't want dnsmasq to read /etc/resolv.conf or any other
+# file, getting its servers from this file instead (see below), then
+# uncomment this.
+no-resolv
+
+# 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
+
+# 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
+# Or which to listen on by address (remember to include 127.0.0.1 if
+# you use this.)
+listen-address=127.0.0.1
+
+# Set the cachesize here.
+cache-size=10000
+
+# Normally responses which come from /etc/hosts and the DHCP lease
+# file have Time-To-Live set as zero, which conventionally means
+# do not cache further. If you are happy to trade lower load on the
+# server for potentially stale date, you can set a time-to-live (in
+# seconds) here.
+local-ttl=300
+
diff --git a/dnsmasq.main b/dnsmasq.main
index d5008b16affd..309079e794b9 100644
--- a/dnsmasq.main
+++ b/dnsmasq.main
@@ -34,3 +34,6 @@ listen-address=127.0.0.1
 # seconds) here.
 local-ttl=300
 
+# Include all files in a directory which end in .conf
+conf-dir=/etc/dnsmasq.d/,*.conf
+
diff --git a/pi-hole-standalone.install b/pi-hole-standalone.install
index 8a121903b719..da4099a566e0 100644
--- a/pi-hole-standalone.install
+++ b/pi-hole-standalone.install
@@ -1,6 +1,6 @@
 post_install() {
   echo -e "\e[1;33m==>\e[0m Please read configuration instructions at /usr/share/doc/pihole/configuration"
-  echo -e "\e[1;33m==>\e[0m \e[1;31mVer. 2.9.5-1\e[0m: dnsmasq conf file is changed"
+  echo -e "\e[1;33m==>\e[0m \e[1;31mVer. 2.9.5-2\e[0m: dnsmasq conf file is changed"
   echo -e "\e[1;33m==>\e[0m \e[1;31mAttention\e[0m: dnsmasq config files used are now two and both mandatory."
   echo -e "\e[1;33m==>\e[0m Pay attention to the name of the destination dnsmasq include config file"
   echo -e "\e[1;33m==>\e[0m Please follow configuration upgrade steps"