[arch-commits] Commit in nginx/trunk (PKGBUILD service)

[Bartłomiej Piotrowski]

    Date: Sunday, May 12, 2013 @ 08:32:07
  Author: bpiotrowski
Revision: 90388

upgpkg: nginx 1.4.1-2

- move binary to /usr/bin

Modified:
  nginx/trunk/PKGBUILD
  nginx/trunk/service

----------+
 PKGBUILD |    6 +++---
 service  |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 06:30:53 UTC (rev 90387)
+++ PKGBUILD	2013-05-12 06:32:07 UTC (rev 90388)
@@ -8,7 +8,7 @@
 
 pkgname=nginx
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64')
 depends=('pcre' 'zlib' 'openssl' 'geoip')
@@ -30,7 +30,7 @@
 		service
 		logrotate)
 sha256sums=('bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119'
-            '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
+            '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
             '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16')
 
 build() {
@@ -39,7 +39,7 @@
 	./configure \
         --prefix=$_cfgdir \
         --conf-path=$_cfgdir/nginx.conf \
-        --sbin-path=/usr/sbin/nginx \
+        --sbin-path=/usr/bin/nginx \
         --pid-path=/var/run/nginx.pid \
         --lock-path=/var/lock/nginx.lock \
         --user=http --group=http \

Modified: service
===================================================================
--- service	2013-05-12 06:30:53 UTC (rev 90387)
+++ service	2013-05-12 06:32:07 UTC (rev 90388)
@@ -5,10 +5,10 @@
 [Service]
 Type=forking
 PIDFile=/run/nginx.pid
-ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit
+ExecStartPre=/usr/bin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
+ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
+ExecReload=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
+ExecStop=/usr/bin/nginx -g 'pid /run/nginx.pid;' -s quit
 
 [Install]
 WantedBy=multi-user.target