dnsmasq cleanup

3 files changed, 4 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 872c0a7b69ea..073a4c2a6258 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 = 4.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/pi-hole/pi-hole
 	install = pi-hole-server.install
 	arch = any
@@ -25,7 +25,6 @@ pkgbase = pi-hole-server
 	backup = etc/dnsmasq.conf
 	source = pihole-4.0.tar.gz::https://github.com/pi-hole/pi-hole/archive/v4.0.tar.gz
 	source = admin-4.0.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v4.0.tar.gz
-	source = dnsmasq.main
 	source = dnsmasq.include
 	source = lighttpd.pi-hole.conf
 	source = nginx.pi-hole.conf
@@ -39,7 +38,6 @@ pkgbase = pi-hole-server
 	source = piholeDebug.sh
 	md5sums = d4e3f74a7a49c243c8b49b27923ecff3
 	md5sums = 176e9bb1bcdbb4cb4e54e859b93d2d0d
-	md5sums = 3f1aeea43af0b192edb36b9e5484ff87
 	md5sums = ad008fac3c7351aa0d5205079b3dfb18
 	md5sums = a3518f54241ef2e67c17c7b144cb6a93
 	md5sums = b63fcf29c29796023a2677bcf2b369a7
diff --git a/PKGBUILD b/PKGBUILD
index 1761bf40c909..433e3c0d2050 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=pi-hole-server
 _pkgname=pi-hole
 pkgver=4.0
-pkgrel=3
+pkgrel=4
 _wwwpkgname=AdminLTE
 _wwwpkgver=4.0
 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.'
@@ -25,7 +25,6 @@ backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt'
 
 source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
 	admin-$_wwwpkgver.tar.gz::https://github.com/$_pkgname/$_wwwpkgname/archive/v$_wwwpkgver.tar.gz
-	dnsmasq.main
 	dnsmasq.include
 	lighttpd.pi-hole.conf
 	nginx.pi-hole.conf
@@ -41,7 +40,6 @@ source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$
 
 md5sums=('d4e3f74a7a49c243c8b49b27923ecff3'
          '176e9bb1bcdbb4cb4e54e859b93d2d0d'
-         '3f1aeea43af0b192edb36b9e5484ff87'
          'ad008fac3c7351aa0d5205079b3dfb18'
          'a3518f54241ef2e67c17c7b144cb6a93'
          'b63fcf29c29796023a2677bcf2b369a7'
@@ -291,6 +289,8 @@ package() {
   install -dm750 "$pkgdir"/etc/sudoers.d
   install -Dm440 $_pkgname-$pkgver/advanced/Templates/pihole.sudo "$pkgdir"/etc/sudoers.d/pihole
   install -Dm644 $_pkgname-$pkgver/advanced/dnsmasq.conf.original "$pkgdir"/etc/dnsmasq.conf
+#  install -Dm644 dnsmasq.main "$pkgdir"/usr/share/pihole/configs/dnsmasq.example.conf
+  install -Dm644 dnsmasq.include "$pkgdir"/etc/dnsmasq.d/01-pihole.conf
 
   install -Dm644 pi-hole.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/pi-hole.conf
 
@@ -309,8 +309,6 @@ package() {
   install -Dm644 /dev/null "$pkgdir"/etc/pihole/whitelist.txt
   install -Dm644 /dev/null "$pkgdir"/etc/pihole/blacklist.txt
 
-  install -Dm644 dnsmasq.main "$pkgdir"/usr/share/pihole/configs/dnsmasq.example.conf
-  install -Dm644 dnsmasq.include "$pkgdir"/etc/dnsmasq.d/01-pihole.conf
   install -Dm644 lighttpd.pi-hole.conf "$pkgdir"/usr/share/pihole/configs/lighttpd.example.conf
   install -Dm644 nginx.pi-hole.conf "$pkgdir"/usr/share/pihole/configs/nginx.example.conf
 
diff --git a/dnsmasq.main b/dnsmasq.main
deleted file mode 100644
index 9b71a43f56a1..000000000000
--- a/dnsmasq.main
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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
-
-# Include all files in a directory which end in .conf
-conf-dir=/etc/dnsmasq.d/,*.conf
-