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

[Bartłomiej Piotrowski]

    Date: Tuesday, May 20, 2014 @ 16:55:22
  Author: bpiotrowski
Revision: 213338

upgpkg: nginx 1.6.0-2

various changes in nginx.service related to FS#40322
- log errors to journald
- use KillSignal and kill to respectively stop and restart nginx
- remove useless config sanity check

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

----------+
 PKGBUILD |    4 ++--
 service  |   15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-20 12:58:24 UTC (rev 213337)
+++ PKGBUILD	2014-05-20 14:55:22 UTC (rev 213338)
@@ -7,7 +7,7 @@
 
 pkgname=nginx
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64')
 url='http://nginx.org'
@@ -28,7 +28,7 @@
         service
         logrotate)
 md5sums=('8efa354f1c3c2ccf434a50d3fbe82340'
-         '5c0cd4fd992596938b2d4fd98b2bac41'
+         'fed60747cefcf90dc9fbfa5fa93cacd1'
          '3441ce77cdd1aab6f0ab7e212698a8a7')
 
 build() {

Modified: service
===================================================================
--- service	2014-05-20 12:58:24 UTC (rev 213337)
+++ service	2014-05-20 14:55:22 UTC (rev 213338)
@@ -1,15 +1,16 @@
 [Unit]
 Description=A high performance web server and a reverse proxy server
-After=syslog.target network.target
+After=network.target
 
 [Service]
-Type=forking
-PIDFile=/run/nginx.pid
-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
+Type=simple
 PrivateDevices=yes
+SyslogLevel=err
 
+ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; daemon off; error_log stderr;'
+ExecReload=/usr/bin/kill -HUP $MAINPID
+KillSignal=SIGQUIT
+KillMode=mixed
+
 [Install]
 WantedBy=multi-user.target