From owner-svn-ports-head@freebsd.org Wed Apr 22 22:09:13 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8CF982C441E; Wed, 22 Apr 2020 22:09:13 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 496vjP39s5z43H4; Wed, 22 Apr 2020 22:09:13 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6434421C64; Wed, 22 Apr 2020 22:09:13 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03MM9DRG003926; Wed, 22 Apr 2020 22:09:13 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03MM9CWv003924; Wed, 22 Apr 2020 22:09:12 GMT (envelope-from osa@FreeBSD.org) Message-Id: <202004222209.03MM9CWv003924@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Wed, 22 Apr 2020 22:09:12 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: in head/www/nginx-devel: . files X-SVN-Commit-Revision: 532602 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2020 22:09:13 -0000 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()