From nobody Sat Oct 14 02:37:19 2023 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 4S6nb34F0qz4x9Bt; Sat, 14 Oct 2023 02:37:19 +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 4S6nb33lcWz4GTm; Sat, 14 Oct 2023 02:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697251039; 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=eqF+7lIS1ya7a5znF7M7EbvaQ4prUT2/AcMQ/KroVus=; b=T03aBaKHyqASGTgYdHXJ+3h8iC/+TTU+HaTt3mcB+eonryx1CCww2jOfgyLVF+2+QGL8Xx cRvrRzgfo1nTpU6JA8pFPLwJgs2rWcup3S31spOEzftbZIeK76w5dSXcdElcbr+Nl2A8S1 JArm0vcS1BSSkPDZJTcQZxMI/fS2JEXgx4bn6XdFmjgA8btDd3gqHRcDcItHyDTQ/gFd9/ rSgSLg8CMxNeGQqRgtKGYz5wcycFNnZam4nROfCXxjPvPb6fiP3Dri/Iu0h0B4nvMhSwea H0RJGmJSJqauUCogFjTUGrJOgoCJzJR4KwlIYaTg/pWX3EthMJpQps9BKBb35A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697251039; a=rsa-sha256; cv=none; b=jcnJCk+5DkGRSjnQvSiSssaDj5PwZB+uIrt7AandlSr2VB154Wvzi3rI5onEkHrMfu8LvK EaGjvOjD9LwjRmJ0Wi2vM121iCsKvfeLpsXDeUW6md4xgkzjkXk4ZxdgrLOiz2LSXPhaVE gj+SAYeLTvgSWz0raMF89PFQn2qf1gEO+WnfiP4mBM7trop5svXFxFoKrdsb5+weD4/GkU VGsYFlT9hLjqYwdqSlJdebpA2/QPGwrEy6scnU/m7LnOSZNZMnbXNK6b1EDrtFxsAEJiPs VKcDyy4jLT029L7fAiGfsEQYXqTqNEIK8RsfmvIb+c1Lr0ZzGWcb7ke784sX8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697251039; 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=eqF+7lIS1ya7a5znF7M7EbvaQ4prUT2/AcMQ/KroVus=; b=a904PE7nx5njuB6GuezofYbst3LewMrpS7WgODzyNs6/iVYfLOkbYiwGvMzhIApe4EAYK9 Zwaeb5UG41crAIeeRW9iuw4jRvDMgL13Q998T0KDTOfRPF4nqcYZr/InMCHdVrFUYog8x1 enhwQwKqJ56Aeou5JnUtun9vsI9FE4NnGmewmO309ETIPUzMrq/gzgK9043VVNEhbOvA/M slGUoJBZ3U9FcI6fgFmXwsiP3o0Df3Fq62NF2l+qbX7Pu0+0gPODQEj4oodumIjZTeOPG7 dyzD6l+g9E+QBjx+gxApvNa/Vh5U4aVZkZVKEccAw0IfNOC3Le96PDnE6ZIBjw== 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 4S6nb32q26z1CRV; Sat, 14 Oct 2023 02:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39E2bJUv001884; Sat, 14 Oct 2023 02:37:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39E2bJS0001879; Sat, 14 Oct 2023 02:37:19 GMT (envelope-from git) Date: Sat, 14 Oct 2023 02:37:19 GMT Message-Id: <202310140237.39E2bJS0001879@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Adam Weinberger Subject: git: 0a8deb50895c - 2023Q4 - www/caddy-custom: Improve admin API endpoint and recommend www:www 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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 0a8deb50895c0dba0e6568baa703abc16f3689ac Auto-Submitted: auto-generated The branch 2023Q4 has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a8deb50895c0dba0e6568baa703abc16f3689ac commit 0a8deb50895c0dba0e6568baa703abc16f3689ac Author: Adam Weinberger AuthorDate: 2023-10-14 02:36:37 +0000 Commit: Adam Weinberger CommitDate: 2023-10-14 02:37:13 +0000 www/caddy-custom: Improve admin API endpoint and recommend www:www (cherry picked from commit 4da17d10a76f877d1942a55d14bfdc57b7eadb1f) --- www/caddy-custom/Makefile | 2 +- www/caddy-custom/files/caddy.in | 42 +++++++++++++++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/www/caddy-custom/Makefile b/www/caddy-custom/Makefile index f109883f308b..3ea4877b837c 100644 --- a/www/caddy-custom/Makefile +++ b/www/caddy-custom/Makefile @@ -4,7 +4,7 @@ PORTNAME= caddy-custom PORTVERSION= ${CADDY_VERSION}.${XCADDY_VERSION} -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= www DISTFILES= # none diff --git a/www/caddy-custom/files/caddy.in b/www/caddy-custom/files/caddy.in index 7ce2aea7e21b..ac1098bcd130 100644 --- a/www/caddy-custom/files/caddy.in +++ b/www/caddy-custom/files/caddy.in @@ -4,14 +4,39 @@ # REQUIRE: LOGIN DAEMON NETWORKING # KEYWORD: shutdown -# To enable caddy, add 'caddy_enable="YES"' to /etc/rc.conf or -# /etc/rc.conf.local +# To enable caddy: +# +# - Edit %%PREVIX%%/etc/caddy/Caddyfile +# See https://caddyserver.com/docs/ +# - Run 'service enable caddy' +# +# 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. +# +# - Use security/portacl-rc to enable privileged port binding: +# +# # pkg install security/portacl-rc +# # sysrc portacl_users+=www +# # sysrc portacl_user_www_tcp="http https" +# # sysrc portacl_user_www_udp="https" +# # service portacl enable +# # service portacl start +# +# - Configure caddy to run as www:www +# +# # sysrc caddy_user=www caddy_group=www +# +# - Note if Caddy has been started as root previously, files in +# /var/log/caddy, /var/db/caddy, and /var/run/caddy may require their ownership +# changing manually. # Optional settings: # caddy_command (string): Full path to the caddy binary # caddy_config (string): Full path to caddy config file # (%%PREFIX%%/etc/caddy/Caddyfile) # caddy_adapter (string): Config adapter type (caddyfile) +# caddy_admin (string): Default administration endpoint +# (unix//var/run/caddy/caddy.sock) # caddy_directory (string): Root for caddy storage (ACME certs, etc.) # (/var/db/caddy) # caddy_extra_flags (string): Extra flags passed to caddy start @@ -39,9 +64,10 @@ load_rc_config $name # Defaults : ${caddy_enable:=NO} : ${caddy_adapter:=caddyfile} -: ${caddy_config:="%%PREFIX%%/etc/caddy/Caddyfile"} +: ${caddy_config:="%%PREFIX%%/etc/${name}/Caddyfile"} +: ${caddy_admin:="unix//var/run/${name}/${name}.sock"} : ${caddy_command:="%%PREFIX%%/bin/${name}"} -: ${caddy_directory:=/var/db/caddy} +: ${caddy_directory:="/var/db/${name}"} : ${caddy_extra_flags:=""} : ${caddy_logdir:="/var/log/${name}"} : ${caddy_logfile:="${caddy_logdir}/${name}.log"} @@ -53,6 +79,9 @@ load_rc_config $name : ${XDG_DATA_HOME:="${caddy_directory}/data"} export XDG_CONFIG_HOME XDG_DATA_HOME +# Default admin interface +export CADDY_ADMIN="${caddy_admin}" + command="${caddy_command}" pidfile="/var/run/${name}/${name}.pid" @@ -70,9 +99,10 @@ else fi # Extra Commands -extra_commands="configtest reload" +extra_commands="configtest reload reloadssl" configtest_cmd="caddy_execute validate ${caddy_flags}" reload_cmd="caddy_execute reload ${caddy_flags}" +reloadssl_cmd="caddy_execute reload --force ${caddy_flags}" caddy_execute() { @@ -115,7 +145,7 @@ caddy_prestop() echo -n "Stopping caddy... " - result="$(caddy_execute stop 2>&1)" + result="$(caddy_execute stop ${caddy_flags} 2>&1)" if [ ${?} -eq 0 ]; then echo "done" exit 0