diff options
| author | max.bra | 2017-02-04 11:48:58 +0100 |
|---|---|---|
| committer | max.bra | 2017-02-04 11:48:58 +0100 |
| commit | 5531caf7c064d283f10adbb66e08e702d5389923 (patch) | |
| tree | 2faa21c9c9ae7b4df5ad1d2389c31ecbc34f2c63 | |
| parent | 370e48afa044809a8d0e74ce38e82c7869f9c642 (diff) | |
| download | aur-5531caf7c064d283f10adbb66e08e702d5389923.tar.gz | |
logrotate error on flush
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
2 files changed, 11 insertions, 2 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.12.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/pi-hole/pi-hole install = pi-hole-server.install arch = any @@ -3,7 +3,7 @@ pkgname=pi-hole-server _pkgname=pi-hole pkgver=2.12.1 -pkgrel=1 +pkgrel=2 _wwwpkgname=AdminLTE _wwwpkgver=2.4 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.' @@ -103,6 +103,14 @@ 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 + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log and bin location to logrotate 2" && return 1 ; fi + +# ----------------- + # change log location to chronometer.sh sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location to chronometer.sh" && return 1 ; fi @@ -206,6 +214,7 @@ package() { install -dm777 "$pkgdir"/etc/pihole install -dm755 "$pkgdir"/etc/pihole/configs install -Dm644 ./$_pkgname-$pkgver/adlists.default "$pkgdir"/etc/pihole/adlists.default || return 1 + install -Dm644 ./$_pkgname-$pkgver/advanced/logrotate "$pkgdir"/etc/pihole/logrotate || return 1 install -Dm644 whitelist.txt "$pkgdir"/etc/pihole/whitelist.txt || return 1 install -Dm644 blacklist.txt "$pkgdir"/etc/pihole/blacklist.txt || return 1 |