[gentoo-commits] gentoo-x86 commit in www-servers/nginx/files: nginx.init-r2

[Benedikt Boehm (hollow)]

hollow      11/09/07 08:34:34

  Modified:             nginx.init-r2
  Log:
  version bump wrt #381153. also fixes bugs #379477, #377713 and #373677.
  
  (Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  www-servers/nginx/files/nginx.init-r2

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.init-r2?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.init-r2?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/files/nginx.init-r2?r1=1.1&r2=1.2

Index: nginx.init-r2
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.init-r2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nginx.init-r2	3 Jan 2010 19:51:41 -0000	1.1
+++ nginx.init-r2	7 Sep 2011 08:34:34 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.init-r2,v 1.1 2010/01/03 19:51:41 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.init-r2,v 1.2 2011/09/07 08:34:34 hollow Exp $
 
 opts="${opts} upgrade reload configtest"
 
@@ -11,7 +11,10 @@
 }
 
 start() {
-	configtest || return 1
+	if [ "${RC_CMD}" != "restart" ]; then
+		configtest || return 1
+	fi
+
 	ebegin "Starting nginx"
 	start-stop-daemon --start --pidfile /var/run/nginx.pid \
 		--exec /usr/sbin/nginx -- -c /etc/nginx/nginx.conf
@@ -19,10 +22,14 @@
 }
 
 stop() {
-	configtest || return 1
+	if [ "${RC_CMD}" = "restart" ]; then
+		configtest || return 1
+	fi
+
 	ebegin "Stopping nginx"
 	start-stop-daemon --stop --pidfile /var/run/nginx.pid
 	eend $? "Failed to stop nginx"
+
 	rm -f /var/run/nginx.pid
 }
 
@@ -60,12 +67,16 @@
 	kill -QUIT `cat /var/run/nginx.pid.oldbin`
 
 	einfo "Upgrade completed"
-
 	eend $? "Upgrade failed"
 }
 
 configtest() {
 	ebegin "Checking nginx' configuration"
-	/usr/sbin/nginx -c /etc/nginx/nginx.conf -t
+	/usr/sbin/nginx -c /etc/nginx/nginx.conf -t -q
+
+	if [ $? -ne 0 ]; then
+		/usr/sbin/nginx -c /etc/nginx/nginx.conf -t
+	fi
+
 	eend $? "failed, please correct errors above"
 }