From nobody Thu Oct 6 21:28:00 2022 X-Original-To: dev-commits-ports-all@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 4Mk4Ks0XQMz4V6SW; Thu, 6 Oct 2022 21:28:01 +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 4Mk4Ks04TKz3rLQ; Thu, 6 Oct 2022 21:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665091681; 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=ipMBVaR3zLl0Er6zPsYwCr6exdgMlp1x2NGjfCJQ724=; b=hLMw/R0hd4QIUf0CrzMDBEQRERJPOX9WL86EVo9+utTVplSSDJt71BonqmQ2Hs0jQ3Jgu+ m4aZTXtjXVaJ3SKf84XusHyjFt5SRcUyFMLIzmNj8VIK36qGR/MwogpB5IpacIH5Nrisnk Z0kFDIq/HkC98wwIfb/i5nBQZVm3anr3NXUVRVaCukFRaU6Er87zlT+nSlToJrxb/6sQcU WyCZWUSyVvMb2ktbAKgIkCVDHqfioUzCVHTsExTCawyXUmZvvxzYvzXrp8kSy4mUMahHfK 2/IdL229I/lNhb75y68/V28oZi13NQtv1alnXEN2joA2mnV0HJpQnzzypKtGAA== 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 4Mk4Kr5ymfzN82; Thu, 6 Oct 2022 21:28:00 +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 296LS0hw005943; Thu, 6 Oct 2022 21:28:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 296LS061005942; Thu, 6 Oct 2022 21:28:00 GMT (envelope-from git) Date: Thu, 6 Oct 2022 21:28:00 GMT Message-Id: <202210062128.296LS061005942@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: 765013b8954a - main - www/xcaddy: Remove the rc(8) script. It is going into caddy-custom instead List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 765013b8954a301339a430a6b27a2b7c84fb474e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665091681; 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=ipMBVaR3zLl0Er6zPsYwCr6exdgMlp1x2NGjfCJQ724=; b=L3Ew7GmspGHWN11PH+EIKjHXwLW16fYzy15J5Oib1tsIZAVjNFifO0yaw684pInda8Bf4j mdHZ6/84PvT8gH7XiINPRQtKrs1vqfhxWOAJZ3X4MWkycXKGxDnKu23SJ445PFgoyfxpMi 4XypK+2R2iJpNtw1/KMaJg1rgJmcwH38iwQLrwVHa2eczeIYRgN4AVaUncnRrr5GjorFcA r2jOTbq984qtC4/1RYarB4GotD4Ece0vni7zXhLuylJpfgxrrPnMTI4A3Hbs1jBG9tB2lE tFW7aT4EEVjTmIGMLzyyfCZ8saqZVOnQEfHZ/k6kSDktnlwN/TDsG5lz/cCfwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665091681; a=rsa-sha256; cv=none; b=FPBBQL0Q/I8dHZdXdFQ7wLfIs7u118WRa4R98/QXLSuY+fxZLzVywNC2VcBaUIaPVxIz+z eDmJ05B65UiFPH9vO1QGSwSOpe+iUxd0AUbNZKQHtdgWpGl91Z1AelywrlSIjSwlNAXzAx EHKOWp4h0y5y30To9vce21X7/kDTCpyOU7ql8Q3BQJ4M+W+MqgY9cnTX6s44eXKfdTI40n q4Refuh2b8S3wCqqb/d54BeIZRgYmVNwB5kMHE9nKm2zKEv9DcgqQicSxEEiYhDvmuI012 7xF0cCG4sSoB7oHFD90D5p6Mu/sqMAm+zxYy6QSDQQOtUdqWGd5DQHkckK0IuA== 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=765013b8954a301339a430a6b27a2b7c84fb474e commit 765013b8954a301339a430a6b27a2b7c84fb474e Author: Adam Weinberger AuthorDate: 2022-10-06 21:23:04 +0000 Commit: Adam Weinberger 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.