Date: Thu, 6 Oct 2022 21:28:00 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: 765013b8954a - main - www/xcaddy: Remove the rc(8) script. It is going into caddy-custom instead Message-ID: <202210062128.296LS061005942@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=765013b8954a301339a430a6b27a2b7c84fb474e commit 765013b8954a301339a430a6b27a2b7c84fb474e Author: Adam Weinberger <adamw@FreeBSD.org> AuthorDate: 2022-10-06 21:23:04 +0000 Commit: Adam Weinberger <adamw@FreeBSD.org> CommitDate: 2022-10-06 21:27:33 +0000 www/xcaddy: Remove the rc(8) script. It is going into caddy-custom instead --- www/xcaddy/Makefile | 6 ------ www/xcaddy/files/{caddy.in => caddy} | 6 +++--- www/xcaddy/pkg-descr | 5 +++++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/www/xcaddy/Makefile b/www/xcaddy/Makefile index a47cab982e28..97aab1d514a8 100644 --- a/www/xcaddy/Makefile +++ b/www/xcaddy/Makefile @@ -14,12 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules -USE_RC_SUBR= caddy -SUB_FILES= caddy -SUB_LIST+= CADDYDIR="${PREFIX}/etc/caddy" - -CONFLICTS_INSTALL= caddy - USE_GITHUB= yes GH_ACCOUNT= caddyserver GH_TUPLE= Masterminds:semver:v3.1.1:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \ diff --git a/www/xcaddy/files/caddy.in b/www/xcaddy/files/caddy similarity index 96% rename from www/xcaddy/files/caddy.in rename to www/xcaddy/files/caddy index 1fc835401889..427df32471bb 100644 --- a/www/xcaddy/files/caddy.in +++ b/www/xcaddy/files/caddy @@ -10,7 +10,7 @@ # Optional settings: # caddy_command (string): Full path to the caddy binary # caddy_config (string): Full path to caddy config file -# (%%PREFIX%%/etc/caddy/Caddyfile) +# (/usr/local/etc/caddy/Caddyfile) # caddy_adapter (string): Config adapter type (caddyfile) # caddy_directory (string): Root for caddy storage (ACME certs, etc.) # (/var/db/caddy) @@ -39,8 +39,8 @@ load_rc_config $name # Defaults : ${caddy_enable:=NO} : ${caddy_adapter:=caddyfile} -: ${caddy_config:="%%PREFIX%%/etc/caddy/Caddyfile"} -: ${caddy_command:="%%PREFIX%%/bin/${name}"} +: ${caddy_config:="/usr/local/etc/caddy/Caddyfile"} +: ${caddy_command:="/usr/local/bin/${name}"} : ${caddy_directory:=/var/db/caddy} : ${caddy_extra_flags:=""} : ${caddy_logdir:="/var/log/${name}"} diff --git a/www/xcaddy/pkg-descr b/www/xcaddy/pkg-descr index 1e4483bfecb2..5d5c14d29ff1 100644 --- a/www/xcaddy/pkg-descr +++ b/www/xcaddy/pkg-descr @@ -3,3 +3,8 @@ automatic HTTPS written in Go. This command line tool and associated Go package makes it easy to make custom builds of the Caddy Web Server. + +There is an rc(8) script in /usr/ports/www/xcaddy/files/caddy that +you can put in /usr/local/etc/rc.d/ if you want. The caddy-custom +port (/usr/ports/www/caddy-custom) can build a custom caddy for +you using xcaddy.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210062128.296LS061005942>