diff options
| author | max.bra | 2018-08-24 23:52:34 +0200 |
|---|---|---|
| committer | max.bra | 2018-08-24 23:52:34 +0200 |
| commit | dd2ec6ca010778196c57254aa8efb0d6414d7946 (patch) | |
| tree | 359e26fa81fcb8186a758b8f20254af180accd25 | |
| parent | b9c28670a2810d42fee092b163f18a105b010198 (diff) | |
| download | aur-dd2ec6ca010778196c57254aa8efb0d6414d7946.tar.gz | |
dnsmasq config file for first installation
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
2 files changed, 8 insertions, 3 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 = 4.0 - pkgrel = 2 + pkgrel = 3 url = https://github.com/pi-hole/pi-hole install = pi-hole-server.install arch = any @@ -22,6 +22,7 @@ pkgbase = pi-hole-server backup = etc/pihole/blacklist.txt backup = etc/dnsmasq.d/01-pihole.conf backup = etc/pihole/adlists.list + 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 @@ -4,7 +4,7 @@ pkgname=pi-hole-server _pkgname=pi-hole pkgver=4.0 -pkgrel=2 +pkgrel=3 _wwwpkgname=AdminLTE _wwwpkgver=4.0 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.' @@ -21,7 +21,7 @@ optdepends=( conflicts=('pi-hole-standalone') install=$pkgname.install backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt' -'etc/dnsmasq.d/01-pihole.conf' 'etc/pihole/adlists.list') +'etc/dnsmasq.d/01-pihole.conf' 'etc/pihole/adlists.list' 'etc/dnsmasq.conf') 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 @@ -254,6 +254,9 @@ prepare() { # pi-hole sudoers file is now populated by install script echo "http ALL=NOPASSWD: /usr/bin/pihole" >> $_pkgname-$pkgver/advanced/Templates/pihole.sudo + # pi-hole dnsmasq config file include ready + echo "conf-dir=/etc/dnsmasq.d/,*.conf" >> $_pkgname-$pkgver/advanced/dnsmasq.conf.original + # adlists.default is gone and adlists.list is populated by install script # from basic-install.sh -- function chooseBlocklists() cat <<EOF > $_pkgname-$pkgver/adlists.list @@ -287,6 +290,7 @@ 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 pi-hole.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/pi-hole.conf |