diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | dnsmasq.main | 3 | ||||
| -rw-r--r-- | pi-hole-server.install | 1 |
4 files changed, 8 insertions, 4 deletions
@@ -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 = 2.9.5 - pkgrel = 4 + pkgrel = 5 url = https://github.com/pi-hole/pi-hole install = pi-hole-server.install arch = any @@ -33,7 +33,7 @@ pkgbase = pi-hole-server md5sums = fe8c5814aa6570085825bc055f8e85b9 md5sums = 6e6ab264586c16350ad2a5a800ab03e7 md5sums = 8b2d15c5e7d152e9207bd82db3ca144d - md5sums = e3b364719011b00d44a9c6bd4c387bcb + md5sums = dc1f4fc9d475f08d2b3ccaaed47a52c2 md5sums = 82ce6717056c7a680fd2dd09bf6f6ff4 md5sums = 990b8abd0bfbba23a7ce82c59f2e3d64 md5sums = 047f13d4ac97877f724f87b002aaee63 @@ -3,7 +3,7 @@ pkgname=pi-hole-server _pkgname=pi-hole pkgver=2.9.5 -pkgrel=4 +pkgrel=5 _wwwpkgname=AdminLTE _wwwpkgver=1.4.4.2 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.' @@ -34,7 +34,7 @@ md5sums=('b383a2741e556a3680b3ae312a18cfba' 'fe8c5814aa6570085825bc055f8e85b9' '6e6ab264586c16350ad2a5a800ab03e7' '8b2d15c5e7d152e9207bd82db3ca144d' - 'e3b364719011b00d44a9c6bd4c387bcb' + 'dc1f4fc9d475f08d2b3ccaaed47a52c2' '82ce6717056c7a680fd2dd09bf6f6ff4' '990b8abd0bfbba23a7ce82c59f2e3d64' '047f13d4ac97877f724f87b002aaee63' diff --git a/dnsmasq.main b/dnsmasq.main index 624cd85d2395..684bfe17c8cb 100644 --- a/dnsmasq.main +++ b/dnsmasq.main @@ -34,3 +34,6 @@ server=8.8.4.4 # 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-server.install b/pi-hole-server.install index 0926046441db..5fe2f9688b9a 100644 --- a/pi-hole-server.install +++ b/pi-hole-server.install @@ -2,6 +2,7 @@ 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 and lighttpd conf files are changed" echo -e "\e[1;33m==>\e[0m \e[1;31mVer. 2.9.5-4\e[0m: dnsmasq.include conf file is changed again" + echo -e "\e[1;33m==>\e[0m \e[1;31mVer. 2.9.5-5\e[0m: dnsmasq.main conf file is changed again and again -_-" 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" |