From b82f11fd76e83d60504649838e60a235b394160f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 30 Aug 2011 23:14:43 +0000
Subject: Tue Aug 30 23:14:43 UTC 2011

---
 community/nginx/PKGBUILD  | 16 +++++++++-------
 community/nginx/changelog |  4 ++++
 community/nginx/nginx     |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 community/nginx/changelog

(limited to 'community/nginx')

diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 3c033eb3e..c014840e9 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 52187 2011-07-21 14:19:08Z spupykin $
+# $Id: PKGBUILD 54994 2011-08-29 20:55:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
-_doc_root=/srv/http/nginx
+_doc_root=/usr/share/nginx/http
 _server_root=/etc/nginx
 _conf_path=${_server_root}/conf
 _tmp_path=/var/spool/nginx
@@ -11,7 +11,7 @@ _user=http
 _group=http
 
 pkgname=nginx
-pkgver=1.0.5
+pkgver=1.0.6
 pkgrel=1
 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
 arch=('i686' 'x86_64')
@@ -24,11 +24,13 @@ backup=("etc/nginx/conf/nginx.conf"
 	"etc/nginx/conf/win-utf"
 	"etc/nginx/conf/mime.types"
 	"etc/nginx/conf/fastcgi_params"
-	"etc/logrotate.d/nginx")
-source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz
+	"etc/logrotate.d/nginx"
+	"etc/conf.d/nginx")
+changelog=changelog
+source=(http://nginx.org/download/nginx-$pkgver.tar.gz
 	nginx)
-md5sums=('373c7761a7c682b92b164c8ee3d6d243'
-         '7e7cafa43a59762b81c4da64e49eca69')
+md5sums=('bc98bac3f0b85da1045bc02e6d8fc80d'
+         '0e8032d3ba26c3276e8c7c30588d375f')
 
 build() {
 	cd $srcdir/nginx-${pkgver}
diff --git a/community/nginx/changelog b/community/nginx/changelog
new file mode 100644
index 000000000..9f2ffcfc8
--- /dev/null
+++ b/community/nginx/changelog
@@ -0,0 +1,4 @@
+2011-08-29 Sergej Pupykin <sergej@p5n.pp.ru>
+
+	* 1.0.6-1 :
+	move /srv/http to /usr/share/nginx/http
diff --git a/community/nginx/nginx b/community/nginx/nginx
index 811656eed..9de10e99a 100644
--- a/community/nginx/nginx
+++ b/community/nginx/nginx
@@ -41,7 +41,7 @@ case "$1" in
     ;;
   stop)
     stat_busy "Stopping Nginx"
-    NGINX_PID=`cat /var/run/nginx.pid`
+    NGINX_PID=`cat /var/run/nginx.pid 2>/dev/null`
     kill -QUIT $NGINX_PID &>/dev/null
     if [ $? -ne 0 ]; then
       stat_fail
-- 
cgit v1.2.3-54-g00ecf