From nobody Thu Nov 21 16:21:51 2024 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 4XvNm01CdHz5dHpY; Thu, 21 Nov 2024 16:21:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XvNm00ghKz4KP6; Thu, 21 Nov 2024 16:21:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732206112; 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=VckcZbOZzEhgqIJO+TKiOCMTq1q6rcLHi2+UVr7q44o=; b=GTWTWPfxtodYLrP3SRKXfi2qouXbS/VEsEW4IyFsi+94X0DHSKcFYRTKpyqg4lU8BnH7f+ E0bbeFou7bC1CVxil+oYQRKD9GRRJi3nb+i5TSnwwE+e5gaCNpG9yjUTB5Vkkrp6pwoPko UZtvkI74dOgrl5jDNnUT3Qyqvc40A4ie/kjXEBGAGwnr9lAWoUVTfuWLtMBdrTnL1kUCAw t8eh40cvsX9FCR21R6KI/DV21e9aet1Vk1B60RoPg3pPC7/BySKPCohib6Ns7a3mvVS/59 Sce7xAtRA3oHaf8srrzy+2UX5GFq4GLVbjMGvks8IoBhUMWiS5w+Z7wrWDR7Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732206112; 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=VckcZbOZzEhgqIJO+TKiOCMTq1q6rcLHi2+UVr7q44o=; b=ZGqDifxlDSPVTLmBvVTk8ICp1x8KUOykUovnA/yvRP4I9jPiB+QljsjRpCffTPwLQBA0a+ Qcuwg+D+79H1BweH8ileJoVmkeKduj7Je6akj6PqojIAh8rr9CrlS/Q29srCAGGYlFmG5M Sc7K1ApHkILuIBz3XCgSxC6Q3FMQsExaQRnTPsG0CQ7KE+PRfnwffbW2+UbwTr1s5/RH0D sppmwxjL+bWci16WJ7xTM0nOPhSRyceY8VJCtj9EjleqfqWRVMvBOwx3mglyKgVt/dR6sB 82WrroWqUz1MGKozqkPz1U9BzZ+vk6TnDBc+hulWYamhwJvWYA1MsVMWPeUrEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732206112; a=rsa-sha256; cv=none; b=WBgzCrq/QmLakoNMVGkEsYF9Qo1RvALDjj88Sy39CgdXHx00ltavKnQ0tpgxgUcIssgtX3 ptszrx+dNTlwTKjYA6MlYEced2GlGl7mYe72Yq5tMcm7FKe16I0/Mfut9OPfwDKwKuvixd UaYDJrHrkgsJGZ4d1ge0pXLNM8wtWj8PZGgWwW1+/QnpXY8rt/co+fBmeVYy4/sLQ/erba bDBcDWkQKrBcIb4hsHHSLqNUNG1k6/CQrXp8cpvwsaa7ZERwZLUJRylzCjBZJcA7y+m6mr vIeXYxmfNZXIDuqo33Jiyb6zlcIGYh82fC2WlPyQz/uTa8o5LMbDYz7w42S71Q== 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 4XvNm00Gvxzn2P; Thu, 21 Nov 2024 16:21:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ALGLpak029646; Thu, 21 Nov 2024 16:21:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ALGLphJ029643; Thu, 21 Nov 2024 16:21:51 GMT (envelope-from git) Date: Thu, 21 Nov 2024 16:21:51 GMT Message-Id: <202411211621.4ALGLphJ029643@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 2aa09e577ed8 - main - www/forgejo: Switch to using "FORGEJO_" prefixed environment variables 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2aa09e577ed8f1a0c1e79abd1836779cb8ca9411 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2aa09e577ed8f1a0c1e79abd1836779cb8ca9411 commit 2aa09e577ed8f1a0c1e79abd1836779cb8ca9411 Author: Rudolph AuthorDate: 2024-11-21 15:49:59 +0000 Commit: Vladimir Druzenko CommitDate: 2024-11-21 16:17:04 +0000 www/forgejo: Switch to using "FORGEJO_" prefixed environment variables Switch the environment variables specified in the Forgejo RC file from "GITEA_" to "FORGEJO_". The old variables are still work, but new are preffered: https://codeberg.org/forgejo/forgejo/src/commit/7015bdfa480e717299377b4547320ae6d70e9da2/modules/setting/path.go#L123 Also, the Forgejo documentation uses new names: https://forgejo.org/docs/latest/admin/config-cheat-sheet/ PR: 282771 Approved by: Stefan Bethke (maintainer) --- www/forgejo/files/forgejo.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/forgejo/files/forgejo.in b/www/forgejo/files/forgejo.in index c635f3a9a9b1..2879239c7d68 100644 --- a/www/forgejo/files/forgejo.in +++ b/www/forgejo/files/forgejo.in @@ -42,8 +42,8 @@ forgejo_start() { /usr/sbin/daemon %%DAEMONARGS%% \ -u ${forgejo_user} -p ${pidfile} \ /usr/bin/env -i \ - "GITEA_WORK_DIR=${forgejo_shared}" \ - "GITEA_CUSTOM=${forgejo_custom}" \ + "FORGEJO_WORK_DIR=${forgejo_shared}" \ + "FORGEJO_CUSTOM=${forgejo_custom}" \ "HOME=${githome}" \ "PATH=%%PREFIX%%/bin:${PATH}" \ "USER=${forgejo_user}" \