Parcourir la source

新增:nginx-1.19.0

呉真 il y a 4 ans
Parent
commit
f130b5cdaf
3 fichiers modifiés avec 8 ajouts et 5 suppressions
  1. 2 2
      nginx-debug.service
  2. 2 2
      nginx.service
  3. 4 1
      nginx.spec

+ 2 - 2
nginx-debug.service

@@ -8,8 +8,8 @@ Wants=network-online.target
 Type=forking
 PIDFile=/var/run/nginx.pid
 ExecStart=/usr/sbin/nginx-debug -c /etc/nginx/nginx.conf
-ExecReload=/bin/kill -s HUP $MAINPID
-ExecStop=/bin/kill -s TERM $MAINPID
+ExecReload=/bin/sh -c "/bin/kill -s HUP $(/bin/cat /var/run/nginx.pid)"
+ExecStop=/bin/sh -c "/bin/kill -s TERM $(/bin/cat /var/run/nginx.pid)"
 
 [Install]
 WantedBy=multi-user.target

+ 2 - 2
nginx.service

@@ -8,8 +8,8 @@ Wants=network-online.target
 Type=forking
 PIDFile=/var/run/nginx.pid
 ExecStart=/usr/sbin/nginx -c /etc/nginx/nginx.conf
-ExecReload=/bin/kill -s HUP $MAINPID
-ExecStop=/bin/kill -s TERM $MAINPID
+ExecReload=/bin/sh -c "/bin/kill -s HUP $(/bin/cat /var/run/nginx.pid)"
+ExecStop=/bin/sh -c "/bin/kill -s TERM $(/bin/cat /var/run/nginx.pid)"
 
 [Install]
 WantedBy=multi-user.target

+ 4 - 1
nginx.spec

@@ -63,7 +63,7 @@ Requires(pre): shadow-utils
 
 %define openssl_version 1.1.1f
 
-%define main_version 1.17.10
+%define main_version 1.19.0
 %define main_release 1%{?dist}.ngx
 
 %define bdir %{_builddir}/%{name}-%{main_version}
@@ -341,6 +341,9 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Tue May 26 2020 Konstantin Pavlov <thresh@nginx.com>
+- 1.19.0
+
 * Tue Apr 14 2020 Konstantin Pavlov <thresh@nginx.com>
 - 1.17.10