From nobody Fri Sep 30 13:39:07 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 4MfBCb6b7qz4dqqF; Fri, 30 Sep 2022 13:39:07 +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 4MfBCb5mbJz3f4J; Fri, 30 Sep 2022 13:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664545147; 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=ZHuzMjuGHWZBBVeUSaCXhJwNabVc3vJ6KgmYbu2FTzQ=; b=uTA+oIuzm0r+ieZ+9zhur8vyPQNADi9YS/GkjRJspjLGARwwescKQcoYovOzQ6CvStMdft hk2LSPxL4daNLQrD/6Myqzqdecw1NeaDB3W9T0PFbDP5mk6mCFdsHoyCHHkqIspp8BG5Br SHGoEqmfPA0vO0ocS1pl3eVg2WkwuYHigJTJrYwMKE6WEzzrLNJZ46Vt3Q+n08f5bEQIc4 74q9d/Lrx0FB+So0kelec0XaC3TSc6hf6DfXy2bgIPBLjNkerlC6mTLwE5SkD04gN/3YC3 P7iwsYfCphfjiuW3YimvwPNFnLTmsZgZG9c/jhpzaT2zcIpEXbzqgxlvz89V9A== 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 4MfBCb4r6yz1B5Y; Fri, 30 Sep 2022 13:39:07 +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 28UDd7oN057499; Fri, 30 Sep 2022 13:39:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28UDd7Hd057498; Fri, 30 Sep 2022 13:39:07 GMT (envelope-from git) Date: Fri, 30 Sep 2022 13:39:07 GMT Message-Id: <202209301339.28UDd7Hd057498@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: 9e47fe9f65ed - main - www/(x)caddy: Fix rc(8) script 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: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e47fe9f65ed633d956ee2f6e19ea9ff6e8a95ff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664545147; 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=ZHuzMjuGHWZBBVeUSaCXhJwNabVc3vJ6KgmYbu2FTzQ=; b=CcjxUmLyVTxgmSltdOLaG+L/RG2ENSZb8KocfUmycjYrCjTDMjRwg0pYdXvcwORVjZ87A0 W6R0kt3jTh7G0z1oestTBh7dWEUhqkDlemHDnVaYvlgaZ+qS23WIMx+Q2KXPrrabVzXUsW Hal7gH1Iu3Ium6X+FMAPs2pIX/kedGpCn0ftP/94igM0jssW7jg+TTNkAjUZ8yItOEeiWx +gmUi62z+bDn3bu2uahPK/1maIq9NhFShFBkVlJDjduZxqYuhgtFSXXkYm1L7sO6z83AWM tSfqdwQY31YcxC8f9mSq++WCc0ajlfYQULgk/puddItVOMut+U7CwT3FrQZpzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664545147; a=rsa-sha256; cv=none; b=Ldi/CE9MB4KCBxTgh68eZO0nnGfXlfqHs9pk1rUvYUijROWVWdHZJpS2caefu91sTVT8kg GgM+u1pBnCxrTlYD3fK2HFeJI/Xi/XM4Onw65ZuU5My2NbjpSldOMXqB3usYaVi9zRe+ae RJUBVmwOfvvc5G4HqpvluuNhhnbzDc072cD5z4CWkA0HzQrCtPIiWEKlwYrilYJRCU6T6y pF1J/Hjin0meSAfP92CaOMiNeVwf+mRhEFX4edTDYVbeu5c9L41u3TWjB8D0DF66xMNQ5Z /A++q+f7/kW13dyz+CaCXlxiRQfmRXUkDX0XI7+9HMz+Ue/NqiuVx4x3B8jyEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e47fe9f65ed633d956ee2f6e19ea9ff6e8a95ff commit 9e47fe9f65ed633d956ee2f6e19ea9ff6e8a95ff Author: Adam Weinberger AuthorDate: 2022-09-30 13:36:55 +0000 Commit: Adam Weinberger CommitDate: 2022-09-30 13:39:02 +0000 www/(x)caddy: Fix rc(8) script rc.subr(8) needs $command to be set or it can't inspect the pidfile. Without it, rc.d/caddy never believes that caddy is running which impedes stopping. Thanks to scf for figuring out what was going wrong here. --- www/caddy/Makefile | 2 +- www/caddy/files/caddy.in | 1 + www/xcaddy/Makefile | 2 +- www/xcaddy/files/caddy.in | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/www/caddy/Makefile b/www/caddy/Makefile index b2b10dce42cb..996886ebdf08 100644 --- a/www/caddy/Makefile +++ b/www/caddy/Makefile @@ -1,7 +1,7 @@ PORTNAME= caddy DISTVERSIONPREFIX= v DISTVERSION= 2.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www DIST_SUBDIR= caddy diff --git a/www/caddy/files/caddy.in b/www/caddy/files/caddy.in index 45c6b83dafb8..85251ab1c02a 100644 --- a/www/caddy/files/caddy.in +++ b/www/caddy/files/caddy.in @@ -53,6 +53,7 @@ load_rc_config $name : ${XDG_DATA_HOME:="${caddy_directory}/data"} export XDG_CONFIG_HOME XDG_DATA_HOME +command="${caddy_command}" caddy_flags="--config ${caddy_config} --adapter ${caddy_adapter}" pidfile="/var/run/${name}/${name}.pid" diff --git a/www/xcaddy/Makefile b/www/xcaddy/Makefile index 3bc889dbe9db..645499c8aae3 100644 --- a/www/xcaddy/Makefile +++ b/www/xcaddy/Makefile @@ -1,7 +1,7 @@ PORTNAME= xcaddy DISTVERSIONPREFIX= v DISTVERSION= 0.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www DIST_SUBDIR= xcaddy diff --git a/www/xcaddy/files/caddy.in b/www/xcaddy/files/caddy.in index e1b137b37380..1fc835401889 100644 --- a/www/xcaddy/files/caddy.in +++ b/www/xcaddy/files/caddy.in @@ -53,6 +53,7 @@ load_rc_config $name : ${XDG_DATA_HOME:="${caddy_directory}/data"} export XDG_CONFIG_HOME XDG_DATA_HOME +command="${caddy_command}" caddy_flags="--config ${caddy_config} --adapter ${caddy_adapter}" pidfile="/var/run/${name}/${name}.pid"