diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | pi-hole-server.install | 1 |
3 files changed, 18 insertions, 13 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Wed Jan 27 08:58:24 UTC 2016 +# Mon Feb 1 06:35:31 UTC 2016 pkgbase = pi-hole-server pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server. pkgver = 2.4 - pkgrel = 2 + pkgrel = 3 url = https://github.com/jacobsalmela/pi-hole install = pi-hole-server.install arch = any @@ -16,7 +16,7 @@ pkgbase = pi-hole-server depends = figlet conflicts = pi-hole-server source = https://github.com/jacobsalmela/pi-hole/archive/v2.4.tar.gz - source = https://github.com/jacobsalmela/AdminLTE/archive/master.zip + source = https://github.com/pi-hole/AdminLTE/archive/v1.0.0.tar.gz source = configuration source = dnsmasq.include source = dnsmasq.complete @@ -27,7 +27,7 @@ pkgbase = pi-hole-server source = whitelist.txt source = blacklist.txt md5sums = b051dc1bd79182262336ce8bc11fb816 - md5sums = ef69a57624685ef11c265785e914782b + md5sums = a2ec5ea92cce506f0fc61cc0a8f2c527 md5sums = 77e128965dbc7e94a31a908f58a5aa6c md5sums = fd607f890103e97e480d814a5dfbee5b md5sums = 06bb49cf66cc1db8be5e476a54b1e933 @@ -3,7 +3,9 @@ pkgname=pi-hole-server _pkgname=pi-hole pkgver=2.4 -pkgrel=2 +pkgrel=3 +_wwwpkgname=AdminLTE +_wwwpkgver=1.0.0 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.' arch=('any') license=('GPL2') @@ -13,7 +15,7 @@ conflicts=('pi-hole-server') install=$pkgname.install source=(https://github.com/jacobsalmela/$_pkgname/archive/v$pkgver.tar.gz - https://github.com/jacobsalmela/AdminLTE/archive/master.zip + https://github.com/pi-hole/AdminLTE/archive/v1.0.0.tar.gz configuration dnsmasq.include dnsmasq.complete @@ -25,7 +27,7 @@ source=(https://github.com/jacobsalmela/$_pkgname/archive/v$pkgver.tar.gz blacklist.txt) md5sums=('b051dc1bd79182262336ce8bc11fb816' - 'ef69a57624685ef11c265785e914782b' + 'a2ec5ea92cce506f0fc61cc0a8f2c527' '77e128965dbc7e94a31a908f58a5aa6c' 'fd607f890103e97e480d814a5dfbee5b' '06bb49cf66cc1db8be5e476a54b1e933' @@ -41,8 +43,8 @@ prepare() { sed -i 's|^ \$SUDO service dnsmasq start| $SUDO systemctl start dnsmasq|' "$srcdir"/$_pkgname-$pkgver/gravity.sh # change log location in admin php interface and scripts - sed -i 's|/var/log/pihole.log|/run/log/pihole.log|' "$srcdir"/AdminLTE-master/index.php - sed -i 's|/var/log/pihole.log|/run/log/pihole.log|' "$srcdir"/AdminLTE-master/api.php + sed -i 's|/var/log/pihole.log|/run/log/pihole.log|' "$srcdir"/$_wwwpkgname-$_wwwpkgver/index.php + sed -i 's|/var/log/pihole.log|/run/log/pihole.log|' "$srcdir"/$_wwwpkgname-$_wwwpkgver/api.php sed -i 's|/var/log/pihole.log|/run/log/pihole.log|' "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh # original toilet is in aur, enter figlet @@ -54,8 +56,12 @@ prepare() { sed -i 's|/inet addr/|/inet /|' "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh # change bin location in admin php interface - sed -i 's|/usr/local/bin/|/usr/bin/|' "$srcdir"/AdminLTE-master/index.php - sed -i 's|/usr/local/bin/|/usr/bin/|' "$srcdir"/AdminLTE-master/api.php + sed -i 's|/usr/local/bin/|/usr/bin/|' "$srcdir"/$_wwwpkgname-$_wwwpkgver/index.php + sed -i 's|/usr/local/bin/|/usr/bin/|' "$srcdir"/$_wwwpkgname-$_wwwpkgver/api.php + + # since we don't directly install from git... + sed -i -e '/<b>Pi-hole Version <\/b> /,+1d' "$srcdir"/$_wwwpkgname-$_wwwpkgver/index.php + sed -i -e '/<div class="pull-right hidden-xs">/a<b>Pi-hole Version </b> '"$pkgver"'\n<b> - Web Interface Version </b>'"$_wwwpkgver"'' "$srcdir"/$_wwwpkgname-$_wwwpkgver/index.php } package() { @@ -79,6 +85,6 @@ package() { install -dm755 "$pkgdir"/srv/http/pihole/admin || return 1 install -Dm644 ./$_pkgname-$pkgver/advanced/index.html "$pkgdir"/srv/http/pihole/index.html || return 1 - cp -dpr --no-preserve=ownership AdminLTE-master/* "$pkgdir"/srv/http/pihole/admin/ + cp -dpr --no-preserve=ownership $_wwwpkgname-$_wwwpkgver/* "$pkgdir"/srv/http/pihole/admin/ } diff --git a/pi-hole-server.install b/pi-hole-server.install index e0514cf8e758..28b845296d7a 100644 --- a/pi-hole-server.install +++ b/pi-hole-server.install @@ -1,7 +1,6 @@ post_install() { cat <<- EOF ==> please read configuration instructions at /usr/share/doc/pihole/configuration - ==> lighttpd config file is changed. please uninstall and reinstall following configuration steps. ==> first install/update run... EOF chown -R http.http /srv/http/pihole |