From nobody Sat Nov 30 22:56:07 2024 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 4Y154l6QPZz5fp4q; Sat, 30 Nov 2024 22:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y154l4JQGz4m0Z; Sat, 30 Nov 2024 22:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733007367; 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=Dz53J0JPpI98Iej6s06bK+3M0Tvs7K4WlrK6+anz8TQ=; b=h7iekWo6Uts1+LjP6fOcawchL/Inmn76sixzDAqdToR2dXZ29+75fjC4kzGrbfOOG5KdUS i+BBsgIFoatd/TwOV66CO8qlz1fvk9dydHBv4JpYSuPsCqe2w0s0XRGodUK98TBfgMYM1K G9Xa+pNRZbdWI5KgFAUzvpmSaR/dlPXWJU5EKZs3ubL3rTTKN+jKeu4bAnoXMj5WMmv51+ g7pFHWUHcHBjMNdtaeK1Z1WeyKcFU/RBBSKcp37ieY6PZfSKg45Qn3kgrkR7GqMkMywAOc h0PqW61tS+3c4osl81d5mC+w+EWN1mDqsm2U+n01KsyDmoFPtw1bbHLci/WDmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733007367; 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=Dz53J0JPpI98Iej6s06bK+3M0Tvs7K4WlrK6+anz8TQ=; b=xpjvRJmVxo5jk45AqG48V68CYeq7Uc2Dz63/d28OU+iPnMYNZaKfLesDnSNFHrCx3fjH/w qAme1ZNDrvpJITvxd64nRnA0tnlVTsoxDuNgL8ND6+rifFtJv4r6+4L5o40A1QT2VpIB4k crDHKm2zACebsehMB4OwhCdXFnjeIfjNL+EYzs0mtxbslGdbFbLy/WomL/h70osCIQV5On yQHyEsKUwQ/a07xN6feTJ+fMsnMh5G4S84Lv4hO7efqvP6kP631s/e+yXDqInr2hWO1x5S iMVOHDmzcnAYierj+F/MNlCzwjiezuQFnVbPAhSMIDXRc/teFM2gw4sGWXf9sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733007367; a=rsa-sha256; cv=none; b=BGnesV2dpix+EvY7F6f1E1euA79PxIVy5jWeN1O7ClQ3+a9ShZ8hyyE/MyF2eMUCJZvC0n nYCJtGJ45fvux/fyEhUvR6MIvvzMQMo1ky/9Pn8ZoexM0GLvPpK/VuMy3YpJdNse+Joa0w ejEWQnBwwQPO53QUhCeosH/P0vNtzppdwJCys06Gh9Z6KJmGSqbU/MpdyFhLjZuH+1Id7q viRhvBbVMIh2UZaVYQFg3cBFsMk+mTIlkRUBrR8zzLDfxMfk3wzJmHzVSMsinRmTB5ibWM PS4Xo0VRgFWQBSFshLYHnVGNuUtNCHXP1WPA6sxQ8f7BSWupVoWlV92QFcs8SA== 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 4Y154l3wTdzRb2; Sat, 30 Nov 2024 22:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AUMu7Lf024708; Sat, 30 Nov 2024 22:56:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUMu74A024705; Sat, 30 Nov 2024 22:56:07 GMT (envelope-from git) Date: Sat, 30 Nov 2024 22:56:07 GMT Message-Id: <202411302256.4AUMu74A024705@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: cc1921f1c1a9 - main - www/caddy, www/caddy-custom: Fix rc(8) instructions 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: cc1921f1c1a9b7b080f7ef0797b1367ff1b41e64 Auto-Submitted: auto-generated The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc1921f1c1a9b7b080f7ef0797b1367ff1b41e64 commit cc1921f1c1a9b7b080f7ef0797b1367ff1b41e64 Author: Adam Weinberger AuthorDate: 2024-11-30 22:47:33 +0000 Commit: Adam Weinberger CommitDate: 2024-11-30 22:55:50 +0000 www/caddy, www/caddy-custom: Fix rc(8) instructions I had 'service enable caddy' instead of 'service caddy enable' in caddy.in, because I get it wrong so often that I had to write a wrapper service() function in my shell. Ludovic submitted a patch for this 5 months ago, but it went into the same cerebral black hole as the order of service arguments. PR: 280127 Reported by: Ludovic Hirlimann --- www/caddy-custom/Makefile | 2 +- www/caddy-custom/files/caddy.in | 2 +- www/caddy/Makefile | 2 +- www/caddy/files/caddy.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/caddy-custom/Makefile b/www/caddy-custom/Makefile index e3d994802054..87271aa6f1a2 100644 --- a/www/caddy-custom/Makefile +++ b/www/caddy-custom/Makefile @@ -4,7 +4,7 @@ PORTNAME= caddy-custom PORTVERSION= ${CADDY_VERSION}.${XCADDY_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www DISTFILES= # none diff --git a/www/caddy-custom/files/caddy.in b/www/caddy-custom/files/caddy.in index cde82315e15a..d8b756adbd35 100644 --- a/www/caddy-custom/files/caddy.in +++ b/www/caddy-custom/files/caddy.in @@ -8,7 +8,7 @@ # # - Edit %%PREFIX%%/etc/caddy/Caddyfile # See https://caddyserver.com/docs/ -# - Run 'service enable caddy' +# - Run 'service caddy enable' # # Note while Caddy currently defaults to running as root:wheel, it is strongly # recommended to run the server as an unprivileged user, such as www:www. diff --git a/www/caddy/Makefile b/www/caddy/Makefile index 662a3c956486..e136b1a7360b 100644 --- a/www/caddy/Makefile +++ b/www/caddy/Makefile @@ -1,7 +1,7 @@ PORTNAME= caddy DISTVERSIONPREFIX= v DISTVERSION= 2.8.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www DIST_SUBDIR= caddy diff --git a/www/caddy/files/caddy.in b/www/caddy/files/caddy.in index e3e554f8ddb3..903ba4954432 100644 --- a/www/caddy/files/caddy.in +++ b/www/caddy/files/caddy.in @@ -8,7 +8,7 @@ # # - Edit %%ETCDIR%%/Caddyfile # See https://caddyserver.com/docs/ -# - Run 'service enable caddy' +# - Run 'service caddy enable' # # Note while Caddy currently defaults to running as root:wheel, it is strongly # recommended to run the server as an unprivileged user, such as www:www.