Package: nginx Version: 1.10.0-1 Dear maintainer,
I noticed the nginx-*.postinst files had the same logic that is implemented by "service nginx upgrade". Please find a patch dropping the duplicated code and reusing the one from the init script. Regards, Simon
commit f55e5f5b1a6594f31c291097d0fa4ce715322ba3
Author: Simon Deziel <simon.dez...@gmail.com>
Date: Wed May 4 13:07:30 2016 -0400
nginx-*.postinst: reuse "upgrade" action from init script
diff --git a/debian/nginx-extras.postinst b/debian/nginx-extras.postinst
index bd9c818..4ea6d9d 100644
--- a/debian/nginx-extras.postinst
+++ b/debian/nginx-extras.postinst
@@ -13,20 +13,7 @@ esac
if [ -x /etc/init.d/nginx ]; then
if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
- NGX_PID=`cat /run/nginx.pid`
- if kill -s USR2 $NGX_PID 2>/dev/null; then
- while [ ! -s /run/nginx.pid.oldbin ] || [ ! -s /run/nginx.pid ]; do
- cnt=`expr $cnt + 1`
- if [ $cnt -gt 10 ]; then
- kill -s KILL $NGX_PID
- invoke-rc.d nginx start
- exit 0
- fi
- sleep 1
- done
- NGX_OLD_PID=`cat /run/nginx.pid.oldbin`
- kill -s QUIT $NGX_OLD_PID
- fi
+ invoke-rc.d nginx upgrade || exit $?
else
invoke-rc.d nginx start || exit $?
fi
diff --git a/debian/nginx-full.postinst b/debian/nginx-full.postinst
index bd9c818..4ea6d9d 100644
--- a/debian/nginx-full.postinst
+++ b/debian/nginx-full.postinst
@@ -13,20 +13,7 @@ esac
if [ -x /etc/init.d/nginx ]; then
if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
- NGX_PID=`cat /run/nginx.pid`
- if kill -s USR2 $NGX_PID 2>/dev/null; then
- while [ ! -s /run/nginx.pid.oldbin ] || [ ! -s /run/nginx.pid ]; do
- cnt=`expr $cnt + 1`
- if [ $cnt -gt 10 ]; then
- kill -s KILL $NGX_PID
- invoke-rc.d nginx start
- exit 0
- fi
- sleep 1
- done
- NGX_OLD_PID=`cat /run/nginx.pid.oldbin`
- kill -s QUIT $NGX_OLD_PID
- fi
+ invoke-rc.d nginx upgrade || exit $?
else
invoke-rc.d nginx start || exit $?
fi
diff --git a/debian/nginx-light.postinst b/debian/nginx-light.postinst
index bd9c818..4ea6d9d 100644
--- a/debian/nginx-light.postinst
+++ b/debian/nginx-light.postinst
@@ -13,20 +13,7 @@ esac
if [ -x /etc/init.d/nginx ]; then
if [ -f /run/nginx.pid ] && pidof /usr/sbin/nginx >/dev/null; then
- NGX_PID=`cat /run/nginx.pid`
- if kill -s USR2 $NGX_PID 2>/dev/null; then
- while [ ! -s /run/nginx.pid.oldbin ] || [ ! -s /run/nginx.pid ]; do
- cnt=`expr $cnt + 1`
- if [ $cnt -gt 10 ]; then
- kill -s KILL $NGX_PID
- invoke-rc.d nginx start
- exit 0
- fi
- sleep 1
- done
- NGX_OLD_PID=`cat /run/nginx.pid.oldbin`
- kill -s QUIT $NGX_OLD_PID
- fi
+ invoke-rc.d nginx upgrade || exit $?
else
invoke-rc.d nginx start || exit $?
fi
signature.asc
Description: OpenPGP digital signature
