From nobody Fri Jan 07 13:12:20 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 405CC193C180; Fri, 7 Jan 2022 13:12:21 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JVkCS74Pwz4fD8; Fri, 7 Jan 2022 13:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D45F33AD6; Fri, 7 Jan 2022 13:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 207DCKeY006557; Fri, 7 Jan 2022 13:12:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 207DCKCl006556; Fri, 7 Jan 2022 13:12:20 GMT (envelope-from git) Date: Fri, 7 Jan 2022 13:12:20 GMT Message-Id: <202201071312.207DCKCl006556@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 7cdfb588b4ce - main - www/nginx: add the ability to customize the stop signal List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cdfb588b4ced018428ce752e88f24e919ceb1aa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641561141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPApRjLB4KkSycJCkaGmJ/ZLXl7huLBznGi6ajN2u90=; b=CEXeLLSZ1LM0Gtc8sgP9q3owycWTngHU2xioMdXMDKm5bR2rAlGZk2dTCEB2GcYxo2XJ1b RB8ng2/XJIk4m+iL62BM+lYHL5jPPEi5a0yKa23TcG+b/AbsPWt8ae2CeK0Oxg/rk5tv4/ q8BFOlUXKwP+IV0p6GOnOxfRWcW9MPQ2AdZEdSRMk7KsaOJItmJ1pYKBPJaD+bhncIR/FX 6IiSc4+y2Ur4wkyCG2QSLIo43LHA++g8vRWbFxqZOoPACb/nsY/6lg/6KvZAKBqBRUVBeW aFTzt4HsBplnJjZPfU/hvKlYs5qsvYHdMz58NcGVHgwSKbIHNDKBr6KLChCJAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641561141; a=rsa-sha256; cv=none; b=UPn2Ly4SFu/DG3Y/7jIheHKDZQhAayHWEky5s8hpu6AG5B3zSc4UEVElWQcsTRdn0I46zB nOVPrF7GjPuOvgLYViQHRbeGc4pj32poA+jnvc+EerRcP7VIPR1/nXYeAplz/aTRrOkmf1 1cEC3OhFOXCBDTLtw9zSLoOztYIPxXk32S4A0FVcPmEOzD7E7QpWV/kDqtnaKCogKTaUk2 xvwEhDUATMc7nGqTZ9TI6AV4Mq4iIFiH+iGn0Z6LXWzX0E77m9LsbFAfr/XXksOC6IkJBM MqaXpGCheNuQ8/2pcC2DJesDEpOnDpfNpOYoJfeDtpw+pVXt/MzqAIJ/nYU7AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cdfb588b4ced018428ce752e88f24e919ceb1aa commit 7cdfb588b4ced018428ce752e88f24e919ceb1aa Author: Jochen Neumeister AuthorDate: 2022-01-07 13:11:05 +0000 Commit: Jochen Neumeister CommitDate: 2022-01-07 13:12:15 +0000 www/nginx: add the ability to customize the stop signal PR: 254961 Sponsored by: Netzkommune GmbH --- www/nginx/Makefile | 2 +- www/nginx/files/nginx.in | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index afd903ce2ba7..e7ea534daa83 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -2,7 +2,7 @@ PORTNAME= nginx PORTVERSION= 1.20.2 -PORTREVISION?= 4 +PORTREVISION?= 5 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/files/nginx.in b/www/nginx/files/nginx.in index ef1c0561e421..37d2c182ebca 100644 --- a/www/nginx/files/nginx.in +++ b/www/nginx/files/nginx.in @@ -25,13 +25,15 @@ # nginx_http_accept_enable (bool): Set to "NO" by default. # Set to yes to check for accf_http kernel module # on start-up and load if not loaded. +# nginx_sig_stop (str): Default to "_TERM" . /etc/rc.subr name="nginx" rcvar=nginx_enable -start_precmd="nginx_precmd" +start_precmd="nginx_prestart" +stop_precmd="nginx_prestop" restart_precmd="nginx_checkconfig" reload_precmd="nginx_checkconfig" configtest_cmd="nginx_checkconfig" @@ -131,7 +133,7 @@ nginx_upgrade() run_rc_command ${rc_prefix}reload $rc_extra_args || return 1 } -nginx_precmd() +nginx_prestart() { if checkyesno nginx_http_accept_enable then @@ -148,4 +150,9 @@ nginx_precmd() fi } ++nginx_prestop() +{ + sig_stop="${nginx_sig_stop:-TERM}" +} + run_rc_command "$1"