upgpkg: tengine-extra 2.0.3-2

Merge updated service file from official nginx build

2 files changed, 10 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fc2d7fb9b487..73ed7f041c14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=tengine-extra
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc='A web server based on Nginx and has many advanced features, originated by Taobao. Some extra modules enabled.'
 arch=('i686' 'x86_64')
 url='http://tengine.taobao.org'
@@ -34,7 +34,7 @@ source=($url/download/tengine-$pkgver.tar.gz
         service
         logrotate)
 sha256sums=('ed024b6040e8f03df575fe7d7a9d274159e2543cd6854d89e173935e930fdfdb'
-            '622205fb90998de2ebacac61c8eee748f89c193d14be44ee39e08ae1e257c90f'
+            'acbd46c74a4caa55635855a033c0a37e0452194335259e7f827b24208199ad6a'
             '245c23906db2a9642fed996ff969e127989a6dcae865c1dd8b422e23ebc94f42')
 
 build() {
diff --git a/service b/service
index 321fd16d417c..4640c0548c3b 100644
--- a/service
+++ b/service
@@ -1,14 +1,17 @@
 [Unit]
 Description=A web server based on Nginx and has many advanced features
-After=syslog.target network.target
+After=network.target
 
 [Service]
 Type=forking
 PIDFile=/run/tengine.pid
-ExecStartPre=/usr/bin/tengine -t -q -g 'pid /run/tengine.pid; daemon on; master_process on;'
-ExecStart=/usr/bin/tengine -g 'pid /run/tengine.pid; daemon on; master_process on;'
-ExecReload=/usr/bin/tengine -g 'pid /run/tengine.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/bin/tengine -g 'pid /run/tengine.pid;' -s quit
+PrivateDevices=yes
+SyslogLevel=err
+
+ExecStart=/usr/bin/tengine -g 'pid /run/tengine.pid; error_log stderr;'
+ExecReload=/usr/bin/kill -HUP $MAINPID
+KillSignal=SIGQUIT
+KillMode=mixed
 
 [Install]
 WantedBy=multi-user.target