Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Apr 2020 22:09:12 +0000 (UTC)
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r532602 - in head/www/nginx-devel: . files
Message-ID:  <202004222209.03MM9CWv003924@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Wed Apr 22 22:09:12 2020
New Revision: 532602
URL: https://svnweb.freebsd.org/changeset/ports/532602

Log:
  Add the knob for the quiet startup.
  
  Bump PORTREVISION.
  
  PR:		245830
  Submitted by:	marck

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/files/nginx.in

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Wed Apr 22 21:55:43 2020	(r532601)
+++ head/www/nginx-devel/Makefile	Wed Apr 22 22:09:12 2020	(r532602)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.18.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa

Modified: head/www/nginx-devel/files/nginx.in
==============================================================================
--- head/www/nginx-devel/files/nginx.in	Wed Apr 22 21:55:43 2020	(r532601)
+++ head/www/nginx-devel/files/nginx.in	Wed Apr 22 22:09:12 2020	(r532602)
@@ -17,6 +17,8 @@
 # nginxlimits_enable (bool):	Set to "NO" by default.
 #				Set it to yes to run `limits $limits_args`
 #				just before nginx starts.
+# nginx_reload_quiet (bool):	Set to "NO" by default.
+#				Set it to yes to suppress info output when testng config.
 # nginx_flags (str):		Set to "" by default.
 #				Extra flags passed to start command.
 # nginxlimits_args (str):	Default to "-e -U %%WWWOWN%%"
@@ -48,6 +50,7 @@ extra_commands="reload configtest upgrade gracefulstop
 [ -z "$nginxlimits_enable" ]	&& nginxlimits_enable="NO"
 [ -z "$nginxlimits_args" ]	&& nginxlimits_args="-e -U %%WWWOWN%%"
 [ -z "$nginx_http_accept_enable" ] && nginx_http_accept_enable="NO"
+[ -z "$nginx_reload_quiet" ]	&& nginx_reload_quiet="NO"
 
 load_rc_config $name
 
@@ -97,8 +100,12 @@ nginx_checkconfig()
 {
 	nginx_checktmpdir
 
-	echo "Performing sanity check on nginx configuration:"
-	eval ${command} ${nginx_flags} -t
+	if checkyesno nginx_reload_quiet; then
+		eval ${command} ${nginx_flags} -t -q
+	else
+		echo "Performing sanity check on nginx configuration:"
+		eval ${command} ${nginx_flags} -t
+	fi
 }
 
 nginx_gracefulstop()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004222209.03MM9CWv003924>