new dnsmasq addn-hosts unmanaged file

4 files changed, 12 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 97dcef9cf41c..5388f989651f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pi-hole-server
 	pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.
 	pkgver = 3.1
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/pi-hole/pi-hole
 	install = pi-hole-server.install
 	arch = any
@@ -40,7 +40,7 @@ pkgbase = pi-hole-server
 	md5sums = 2c0bf61ec96bdb85edeb9fd2cc2f330b
 	md5sums = 3acf27ca01d931db363634dbfc95a061
 	md5sums = 3f1aeea43af0b192edb36b9e5484ff87
-	md5sums = f39fa3e607ff7346e93febfa2d0e565e
+	md5sums = 7ac346581ada71187b7fd18f164bbee9
 	md5sums = 2d10140f19f54015e6ab2807267e8aaf
 	md5sums = a8a64dc2ff89bb87d534c83189447abc
 	md5sums = ebe0b0785fcc7b10accff3c1ae793cd2
diff --git a/PKGBUILD b/PKGBUILD
index 438bf8b0d023..33fe966256fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=pi-hole-server
 _pkgname=pi-hole
 pkgver=3.1
-pkgrel=5
+pkgrel=6
 _wwwpkgname=AdminLTE
 _wwwpkgver=3.1
 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.'
@@ -44,7 +44,7 @@ md5sums=('e24ce6a12ee97cd7de2c5ab13af99511'
          '2c0bf61ec96bdb85edeb9fd2cc2f330b'
          '3acf27ca01d931db363634dbfc95a061'
          '3f1aeea43af0b192edb36b9e5484ff87'
-         'f39fa3e607ff7346e93febfa2d0e565e'
+         '7ac346581ada71187b7fd18f164bbee9'
          '2d10140f19f54015e6ab2807267e8aaf'
          'a8a64dc2ff89bb87d534c83189447abc'
          'ebe0b0785fcc7b10accff3c1ae793cd2'
@@ -136,8 +136,10 @@ prepare() {
   # change log and bin location to logrotate
   sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/logrotate
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log and bin location to logrotate 1" && return 1 ; fi
-  sed -i "s|/usr/sbin|/usr/bin|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh
+  sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/logrotate
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log and bin location to logrotate 2" && return 1 ; fi
+  sed -i "s|/usr/sbin|/usr/bin|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh
+  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log and bin location to logrotate 3" && return 1 ; fi
 
 # -----------------
 
diff --git a/dnsmasq.include b/dnsmasq.include
index 7749fdadc3e3..16a1e4cc7b38 100644
--- a/dnsmasq.include
+++ b/dnsmasq.include
@@ -22,7 +22,9 @@
 
 addn-hosts=/etc/pihole/gravity.list
 addn-hosts=/etc/pihole/local.list
+addn-hosts=/etc/pihole/black.list
 domain-needed
+localise-queries
 bogus-priv
 no-resolv
 cache-size=10000
diff --git a/pi-hole-server.install b/pi-hole-server.install
index ba6c766fbeff..31b1e3c952b2 100644
--- a/pi-hole-server.install
+++ b/pi-hole-server.install
@@ -1,8 +1,8 @@
 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 or ArchWiki page at \e[1;36mhttps://wiki.archlinux.org/index.php/Pi-hole\e[0m"
-#  echo -e "\e[1;33m==>\e[0m \e[1;31mVer. 3.0.1-1\e[0m: lighttpd conf file is changed"
-#  echo -e "\e[1;33m==>\e[0m Please follow configuration upgrade steps"
+  echo -e "\e[1;33m==>\e[0m \e[1;31mVer. 3.1-6\e[0m: dnsmasq conf file is changed"
+  echo -e "\e[1;33m==>\e[0m Please follow configuration upgrade steps"
   echo -e "\e[1;33m==>\e[0m Neutrino emissions detected..."
   touch /etc/dnsmasq.d/02-pihole-dhcp.conf
   touch /etc/dnsmasq.d/03-pihole-wildcard.conf
@@ -12,7 +12,7 @@ post_install() {
   _dnsmasq_address_setup
 
   /usr/bin/pihole updateGravity > /dev/null
-  /usr/bin/pihole -a setdns 8.8.8.8 > /dev/null
+  /usr/bin/pihole -a setdns 8.8.8.8,8.8.4.4 > /dev/null
 }
 
 post_upgrade() {