From nobody Thu Oct 6 22:11:41 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 4Mk5JF5Lskz4VGW2; Thu, 6 Oct 2022 22:11:41 +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 4Mk5JF4m1vz3wjt; Thu, 6 Oct 2022 22:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665094301; 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=ylCNBFaaz/oOeA9jaZUu1LtdPjeOVSLeRlgwPgouTIE=; b=jOzWStNix9sjN2uodzqsRbdTCstOCLtcPZ60iiMN/kksm5BHfbT12ow0zRS/5bkw19Q1gc XkPMlTD4d0A9wEMUqn74w+LYvx5+gI1jXXAke2OSGam2/iOX/vm3Y6YwEXsq2y4Rs0xUU9 Rk1pSL01pTec0sbTOJ1E58OpDJwEOzp96N3RHa2sUBnN+Ep4khvlnX0Rf/jwCQOhmKuCeG 5R+4SL/8l7OkemdtZS7BZuvkkRN4uNzwTA5/OI9bbiu+RzOuxOdczME+Zhq16qxMEjoVX5 1nzERO9HPveRavDKetcl6qmITECN2+Xr7d7AQ4WoGOcIxUqVbrmAKfQdDLtQ5w== 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 4Mk5JF3q0WzNyB; Thu, 6 Oct 2022 22:11:41 +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 296MBf5A066502; Thu, 6 Oct 2022 22:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 296MBfnj066501; Thu, 6 Oct 2022 22:11:41 GMT (envelope-from git) Date: Thu, 6 Oct 2022 22:11:41 GMT Message-Id: <202210062211.296MBfnj066501@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: d575da67486c - main - www/caddy-custom: Fix path to Caddyfile 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: d575da67486ccba512c494d715a999aa7ea77473 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665094301; 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=ylCNBFaaz/oOeA9jaZUu1LtdPjeOVSLeRlgwPgouTIE=; b=HNUWme1dKLhNkfRVGz2CRt0jpEx3AR+OVhrdpD1Ia1iGjcvPspxIRhO3+a77BaVhNWEDom 5zWn3NhzNlHF5pujB2apBl0Q3IOPuw8dXK+Cv66RC3Yt3oO7NxFbO/eyJqtS6sDJuIqEfx L4GPGoOm/guiUC6G3EvzI1jgvVNNE/Hl/AqO3NcDJw0hvLg+i+cgPfzE1nv1eZ02Fa3Pp2 fuR7pYMkEux6/8VVxJdCInY7DeOBWES+mQ6DA5+q7ql/iJa8fiKFAFRqNsvQWd02usc42Z TlqPRdmsxIASB2qSstEFOD1vw2vcSkcmUb4T1pwjhJLTY1+0iRwKRUsNkOn8EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665094301; a=rsa-sha256; cv=none; b=KlcL0cSFQ9qYoeyeL29dz6UlIn0NGRkchi4Xht+J+/QEmOoLsXU0H7ZaEQ6ani+CsXGuZz 1Fak4jWpNCT87VqGX28+4qrMu7hWWi2Z7io6FRZ87doLvXw//baYjhcAcVLzuE11qktPG4 S77rOfjXiem8Gi4wJ8TZzTZz8O4gm208pkXUMp6gC4Vaqxw8fZC/TDssS8YbgYs8U/4LH0 1LqNtW+/2KMNNmbjAtmR609M2sCFqcQW0vZN06302hxNMo6CRNqG55Kzhd7rdm6RUTXOJ9 qGYF3GM0yV3lOEY4FONI5pezp7gNzHBdX9XIQ+1xRgVN5VdlwFzOGotGgtGyqg== 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=d575da67486ccba512c494d715a999aa7ea77473 commit d575da67486ccba512c494d715a999aa7ea77473 Author: Adam Weinberger AuthorDate: 2022-10-06 22:11:31 +0000 Commit: Adam Weinberger CommitDate: 2022-10-06 22:11:37 +0000 www/caddy-custom: Fix path to Caddyfile --- www/caddy-custom/files/caddy.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/caddy-custom/files/caddy.in b/www/caddy-custom/files/caddy.in index a67e3e832bbc..1fc835401889 100644 --- a/www/caddy-custom/files/caddy.in +++ b/www/caddy-custom/files/caddy.in @@ -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/Caddyfile) +# (%%PREFIX%%/etc/caddy/Caddyfile) # caddy_adapter (string): Config adapter type (caddyfile) # caddy_directory (string): Root for caddy storage (ACME certs, etc.) # (/var/db/caddy) @@ -39,7 +39,7 @@ load_rc_config $name # Defaults : ${caddy_enable:=NO} : ${caddy_adapter:=caddyfile} -: ${caddy_config:="%%PREFIX%%/etc/Caddyfile"} +: ${caddy_config:="%%PREFIX%%/etc/caddy/Caddyfile"} : ${caddy_command:="%%PREFIX%%/bin/${name}"} : ${caddy_directory:=/var/db/caddy} : ${caddy_extra_flags:=""}