summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--nginx.service13
3 files changed, 10 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c3e561dc4f92..1c5708e10d1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Dec 12 17:15:52 UTC 2016
+# Fri Dec 16 21:16:38 UTC 2016
pkgbase = nginx-devel
pkgdesc = Lightweight HTTP server and IMAP/POP3 proxy server - development version
pkgver = 1.11.6
- pkgrel = 2
+ pkgrel = 3
url = http://nginx.org
install = nginx.install
changelog = CHANGES.pkgbuild.md
@@ -57,7 +57,7 @@ pkgbase = nginx-devel
source = https://github.com/m0zes/nginx-sflow-module/archive/release-0.9.10.tar.gz
source = concat-1.2.2.tar.gz::https://github.com/alibaba/nginx-http-concat/archive/1.2.2.tar.gz
sha256sums = 3153abbb518e2d9c032e1b127da3dc0028ad36cd4679e5f3be0b8afa33bc85bd
- sha256sums = 4ecbc33ce4bf2965996f51b0c7edb677904ba5cff9a32e93e1487a428d3a751b
+ sha256sums = 05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b
sha256sums = 272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98
sha256sums = e299680e919a97c7ec06b62e4fabc3b5ead837fe486a5f87260bd16d0b51e112
sha256sums = 9174cfea524ed4839062dc267d1b561db9f512407682982be42979f98cbdfff7
diff --git a/PKGBUILD b/PKGBUILD
index 31c263f69b36..5a2741a42f88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=nginx-devel
_pkgname=nginx
pkgver=1.11.6
-pkgrel=2
+pkgrel=3
pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server - development version'
url="http://nginx.org"
arch=(i686 x86_64 armv6h)
@@ -151,7 +151,7 @@ ${_modules_URL[*]}
validpgpkeys=(
)
sha256sums=('3153abbb518e2d9c032e1b127da3dc0028ad36cd4679e5f3be0b8afa33bc85bd'
- '4ecbc33ce4bf2965996f51b0c7edb677904ba5cff9a32e93e1487a428d3a751b'
+ '05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
'272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98'
'e299680e919a97c7ec06b62e4fabc3b5ead837fe486a5f87260bd16d0b51e112'
'9174cfea524ed4839062dc267d1b561db9f512407682982be42979f98cbdfff7'
diff --git a/nginx.service b/nginx.service
index adfe6c0abbee..29d3aa877aa9 100644
--- a/nginx.service
+++ b/nginx.service
@@ -1,17 +1,14 @@
[Unit]
Description=A high performance web server and a reverse proxy server
-After=network.target
+After=syslog.target network.target
[Service]
Type=forking
PIDFile=/run/nginx.pid
-PrivateDevices=yes
-SyslogLevel=err
-
-ExecStart=/usr/bin/nginx -g 'pid /run/nginx.pid; error_log stderr;'
-ExecReload=/usr/bin/kill -HUP $MAINPID
-KillSignal=SIGQUIT
-KillMode=mixed
+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