From nobody Sun Jan 21 13:08:14 2024 X-Original-To: dev-commits-ports-main@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 4THtvL3gxZz57RH9; Sun, 21 Jan 2024 13:08:14 +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 4THtvL2mr9z4X61; Sun, 21 Jan 2024 13:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705842494; 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=4Lq9on4lcOmN3UUxYSHVhv28QwHtRNISnPtuuaRtSOg=; b=ixTejZv+KJNWXNH0MsFfUb8oEr8oUi21wxbv/jwhQuy1ntgx9TWJ53bEckKgnf+RUlLyOr L0nnL4ix8ZQjbkGnTpQ/+nbZKBBxef7AIrBmoxfxYNtr/ONGhWE0oDYpoS2RiR7BW8oQOm BnvxaxkgRrcv80/eoOJ3vhxbZpLnTOxm1Lca5omdOL1Lt+84GilFiX1O+Kx0HZzM5jXIeQ DyQFxxQsJCZeVhhQfY2Hom+pYtGIPiX5uMM1FUD7LwGRDcYxcpg2SBFXIg44y1HtmLdRqh cS4xNonLwmaDTRmhkBMD0bIeMRiiQPSmYGJOF6V8b607ZvLsWuJLn7sAZ3U1/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705842494; 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=4Lq9on4lcOmN3UUxYSHVhv28QwHtRNISnPtuuaRtSOg=; b=ugq+pMq1ul8Pm3VbBWnipKrysa1p4/xuV/gdFMXM0qfoXJXspR9aOTfLDdXy8srw3bTdAe kVC2wmP27p/o7TM514SGaX6U/ttGwvsXuB4NfPOmq1u8H0fuXxgzxHhNzQbhlW2vRfCBZv weOCbYGATIij9EaPInKcSF1D68AOj4UjKovjORVDKNZW6HEJLEGEI0UvJjyQooGCUw4T3U rNAb/u6ETHhUEv8XiIm7hQ+HGQiLHhZdt/cp4VTmEeLcnnvXUOqz5cqXiJu0IpIPV3h/fo PjrjNbuG6nBdH7TcyOMLnIWD+761JmBvVVQhTH/4K12ofCSDKe45PQrYGykVDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705842494; a=rsa-sha256; cv=none; b=DD99YAwqkac8ZY1J8D9qKDE9SOFHpBaturAqWN7q8dyo8OrulzxIOCLHrHzQGqpkWh1TdC jupLFvJoTILLWmGDTQ5ejDyZXTluWefW/OefcluKQUapk3b4wiqhT10y5wEGt9y1AX0LJN 79ZsVowoEDez256mGbv78jhGb6c6uR2bfKEGB8qq/+fzflHOUx6WmRlDVyeeW5hCsZvC9e LOAloL3ncQiHb2caBqYKfp3QkFWsbEgk9+8eAvHohECFXOjyCGRw2X0isheITviN5xqKyA 9Un73qd4A/PdiuI4bwyXhABYkmlBRfUsFsUSyGomwd99tM1ZNi49Fp3d0vnNZA== 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 4THtvL1Wf3zJtJ; Sun, 21 Jan 2024 13:08:14 +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 40LD8Epn027926; Sun, 21 Jan 2024 13:08:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40LD8EZK027923; Sun, 21 Jan 2024 13:08:14 GMT (envelope-from git) Date: Sun, 21 Jan 2024 13:08:14 GMT Message-Id: <202401211308.40LD8EZK027923@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: 5c6886afad6f - main - www/caddy{,-custom}: chown caddy.log to caddy user/group List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 5c6886afad6f39c5c0a9f8b8ccd16cea8cad8504 Auto-Submitted: auto-generated The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c6886afad6f39c5c0a9f8b8ccd16cea8cad8504 commit 5c6886afad6f39c5c0a9f8b8ccd16cea8cad8504 Author: Mike Fisher AuthorDate: 2024-01-21 13:04:55 +0000 Commit: Adam Weinberger CommitDate: 2024-01-21 13:08:10 +0000 www/caddy{,-custom}: chown caddy.log to caddy user/group We have set caddy.log to root:wheel, which works for the default case of running caddy as root. When caddy is run as a non-root users, caddy.log can't actually be written to. Instead, chown caddy.log to the caddy user/group so that it can be written to. PR: 276150 --- www/caddy-custom/Makefile | 2 +- www/caddy-custom/files/caddy.in | 4 ++-- www/caddy/Makefile | 2 +- www/caddy/files/caddy.in | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/www/caddy-custom/Makefile b/www/caddy-custom/Makefile index 19ddef881324..f1bdbb360dd2 100644 --- a/www/caddy-custom/Makefile +++ b/www/caddy-custom/Makefile @@ -4,7 +4,7 @@ PORTNAME= caddy-custom PORTVERSION= ${CADDY_VERSION}.${XCADDY_VERSION} -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= www DISTFILES= # none diff --git a/www/caddy-custom/files/caddy.in b/www/caddy-custom/files/caddy.in index fc1f74e1de55..fc7cc986e1d7 100644 --- a/www/caddy-custom/files/caddy.in +++ b/www/caddy-custom/files/caddy.in @@ -119,9 +119,9 @@ caddy_precmd() /usr/bin/install -d -m 700 -o "${caddy_user}" -g "${caddy_group}" /var/run/caddy if [ -e ${caddy_logfile} ]; then /bin/chmod 644 ${caddy_logfile} - /usr/sbin/chown root:wheel ${caddy_logfile} + /usr/sbin/chown "${caddy_user}:${caddy_group}" ${caddy_logfile} else - /usr/bin/install -m 644 -o root -g wheel /dev/null ${caddy_logfile} + /usr/bin/install -m 644 -o "${caddy_user}" -g "${caddy_group}" /dev/null ${caddy_logfile} fi } diff --git a/www/caddy/Makefile b/www/caddy/Makefile index b6bf4f6044db..cfbde9ea7c9b 100644 --- a/www/caddy/Makefile +++ b/www/caddy/Makefile @@ -1,7 +1,7 @@ PORTNAME= caddy DISTVERSIONPREFIX= v DISTVERSION= 2.7.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www DIST_SUBDIR= caddy diff --git a/www/caddy/files/caddy.in b/www/caddy/files/caddy.in index 34b0157f1d00..e3e554f8ddb3 100644 --- a/www/caddy/files/caddy.in +++ b/www/caddy/files/caddy.in @@ -119,9 +119,9 @@ caddy_precmd() /usr/bin/install -d -m 700 -o "${caddy_user}" -g "${caddy_group}" /var/run/caddy if [ -e ${caddy_logfile} ]; then /bin/chmod 644 ${caddy_logfile} - /usr/sbin/chown root:wheel ${caddy_logfile} + /usr/sbin/chown "${caddy_user}:${caddy_group}" ${caddy_logfile} else - /usr/bin/install -m 644 -o root -g wheel /dev/null ${caddy_logfile} + /usr/bin/install -m 644 -o "${caddy_user}" -g "${caddy_group}" /dev/null ${caddy_logfile} fi }