diff options
| author | root <root@rshg047.dnsready.net> | 2011-04-10 04:43:11 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-04-10 04:43:11 +0000 |
| commit | 8f6922302486fa1cc1112ff8b3daddb48c3260f2 (patch) | |
| tree | cdd13036f76c8a9b8efcc83bbaea166cc929a527 /extra/lighttpd | |
| parent | f87ab435eb966ec44eb006c48699e6ee90613286 (diff) | |
Sun Apr 10 04:43:11 UTC 2011
Diffstat (limited to 'extra/lighttpd')
| -rw-r--r-- | extra/lighttpd/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/lighttpd/lighttpd.rc.d | 15 |
2 files changed, 15 insertions, 13 deletions
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index f8c7e2b44..d713582b6 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 115072 2011-03-16 17:59:33Z pierre $ +# $Id: PKGBUILD 118904 2011-04-09 11:33:06Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.28 -pkgrel=4 +pkgrel=5 pkgdesc='a secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ options=('!libtool' 'emptydirs') source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf') md5sums=('586eb535d31ac299652495b058dd87c4' - 'f110637c56d360ecaecb3bf6f7918229' + 'eadffcda24d0d996032f8555ce9623c2' '913e2157fa78d990c32146f387d44c2b' '2803a9ee7f20409c69f1566d2d90720e') @@ -43,6 +43,11 @@ build() { make } +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install @@ -50,7 +55,7 @@ package() { install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf - install -d -m755 -o http -g http $pkgdir/var/{run,log,cache}/lighttpd/ + install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/ pushd doc/config >/dev/null find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \; diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d index 5f851d63e..32fdd0d08 100644 --- a/extra/lighttpd/lighttpd.rc.d +++ b/extra/lighttpd/lighttpd.rc.d @@ -5,7 +5,7 @@ get_pid_file() { - /usr/sbin/lighttpd -p -f /etc/lighttpd/lighttpd.conf 2>/dev/null | grep server.pid-file | cut -d= -f2 + /usr/sbin/lighttpd -p -f /etc/lighttpd/lighttpd.conf 2>/dev/null | grep server.pid-file | sed -E 's/.*"(.+)"/\1/' } get_pid() { @@ -37,20 +37,17 @@ test_config() { stat_die fi - local d - for d in /var/{run,log,cache}/lighttpd; do - if [ ! -d $d ]; then - stat_append "(directory $d not found)" - stat_die - fi - done - /usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1 if [ $? -gt 0 ]; then stat_append '(error in /etc/lighttpd/lighttpd.conf)' stat_die fi + local piddir=$(dirname "$(get_pid_file)") + if [ ! -d "{$piddir}" ]; then + install -d -m755 -o http -g http "${piddir}" + fi + stat_done } |