summaryrefslogtreecommitdiff
path: root/community/nginx
diff options
context:
space:
mode:
authorroot <root@rshg047.dnsready.net>2011-07-13 23:12:30 +0000
committerroot <root@rshg047.dnsready.net>2011-07-13 23:12:30 +0000
commit29657877f6a02dbba1bd58b417b4ccd211939690 (patch)
tree0213b621a87e176f90d19cf8e894d1da8fd0d1b6 /community/nginx
parent079c689ef9b252fd82dbf9b182ec2517c48f8737 (diff)
Wed Jul 13 23:12:30 UTC 2011
Diffstat (limited to 'community/nginx')
-rw-r--r--community/nginx/PKGBUILD6
-rw-r--r--community/nginx/nginx10
2 files changed, 10 insertions, 6 deletions
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 6fd5e2b2b..c8db06edd 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48812 2011-06-06 11:51:15Z spupykin $
+# $Id: PKGBUILD 51647 2011-07-12 14:13:55Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
@@ -12,7 +12,7 @@ _group=http
pkgname=nginx
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
arch=('i686' 'x86_64')
depends=('pcre' 'zlib' 'openssl')
@@ -28,7 +28,7 @@ backup=("etc/nginx/conf/nginx.conf"
source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz
nginx)
md5sums=('d23f6e6b07b57ac061e790b1ed64bb98'
- '837b010afcbdfe82d8e65ef00c4e14ba')
+ '7e7cafa43a59762b81c4da64e49eca69')
build() {
cd $srcdir/nginx-${pkgver}
diff --git a/community/nginx/nginx b/community/nginx/nginx
index 2d5a02a47..811656eed 100644
--- a/community/nginx/nginx
+++ b/community/nginx/nginx
@@ -41,12 +41,16 @@ case "$1" in
;;
stop)
stat_busy "Stopping Nginx"
- kill -QUIT `cat /var/run/nginx.pid` &>/dev/null
+ NGINX_PID=`cat /var/run/nginx.pid`
+ kill -QUIT $NGINX_PID &>/dev/null
if [ $? -ne 0 ]; then
stat_fail
else
- rm_daemon nginx
- stat_done
+ for i in `seq 1 10`; do
+ [ -d /proc/$NGINX_PID ] || { stat_done; rm_daemon nginx; exit 0; }
+ sleep 1
+ done
+ stat_fail
fi
;;
restart)