Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Nov 2024 22:56:07 GMT
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cc1921f1c1a9 - main - www/caddy, www/caddy-custom: Fix rc(8) instructions
Message-ID:  <202411302256.4AUMu74A024705@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by adamw:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cc1921f1c1a9b7b080f7ef0797b1367ff1b41e64

commit cc1921f1c1a9b7b080f7ef0797b1367ff1b41e64
Author:     Adam Weinberger <adamw@FreeBSD.org>
AuthorDate: 2024-11-30 22:47:33 +0000
Commit:     Adam Weinberger <adamw@FreeBSD.org>
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.



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