From nobody Fri Nov 15 15:57:50 2024 X-Original-To: dev-commits-ports-branches@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 4XqhW31WN1z5dJ4x; Fri, 15 Nov 2024 15:57:51 +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 4XqhW25Hzbz4CS4; Fri, 15 Nov 2024 15:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686270; 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=c4pPYKAw0zDD7XpR/KsyuaYLekaE8jo/a6h0/Vp/j7I=; b=FRBJoFIyjzSjQ4fveJrUeN9JX7Qzjkjcm9UGooHWWkCN/yb70n2kgP4lh6giDl8LwUF9Kc 7ZvpX3Uqp9qLc70pWLnj92c3IS9HLlfRLipBzJkVldzuyG4eT9qIuxGMa6r8SyO8XrhjEQ Fy3ciwP8QplbSYT1a2pYSo9y3erLmHz5m5oXlEfrKRExo8FZob3jaUy5hPCga7quciOXhr VLUrOoh1ZuNHlBhEib1ftHjDXg3KuDp4WGxJ3qZx9+YAt0tB6dCJ6PTWBfLi/c6wFAbiDo Y9awQrzV83RqZrmIPkKDvZcBbXg7WFlEq0CkmsxCbLwetlGpOYTAjcqA8gw2Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686270; 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=c4pPYKAw0zDD7XpR/KsyuaYLekaE8jo/a6h0/Vp/j7I=; b=gxzu+mmY00aqSRJ//CGbqWj2wZUp4Y6fsES60seRyMm+zuEP3WGg2HpDqtH9uVOEM03SLA ygnFEwbgnpjySln1YHY4SeAWkutWley+aN/l2OHSW1U6y5BYvoqclnm6M0+SN+nw0/MKT3 Ri5bD1FwaMIRvj54QcQ/tixNsOITOT2l6WAW0pQSghcII2t3E8fndASACsR0EIoG9h8Ob8 dDKAbGIv6pNqs+xWDVPaugmxVhLss/+LaZlW9u0+WGxrmv67Kx4wsmu5QG3HdTNPhFnZgU hqkEW0y9bi0yYFzBxXZeoAWRtWxjW2Ncyjwf4cJRfbZYugEDohnzNP3Y5qpCsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731686270; a=rsa-sha256; cv=none; b=OKi7scy0pKvBZbtQvTZXdVW0QPG91uc7iyLe0OwL4uhSwETpxL4lXv6ZQqZqcdhv+gRY7w VtguIIei6PepW88oonzepg6tqh5Mgx13IkTA5M1XySn75pVczjcv/9FNoCk0M0+2+yMHIi SI8VZpU6zShhmevagqfLXrzzcXxyBt2gR72nTyrZ8RaCIphn0fjQmyQ73BO+fE05cn5c7q vYDmX2l5s5ihfU1LIa9OEc3YU0RDsplD+OjCkSujCzRVB7jGNvZmlFgR5oanuyOz89fyEn b+cWf7/XYq0avY3mjMXUCbZgE+FqWTCBd7IRAgbOQfYs1YLmPjvuPdsp3iTY1w== 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 4XqhW23GNhzTFb; Fri, 15 Nov 2024 15:57:50 +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 4AFFvobH094547; Fri, 15 Nov 2024 15:57:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFFvoOi094544; Fri, 15 Nov 2024 15:57:50 GMT (envelope-from git) Date: Fri, 15 Nov 2024 15:57:50 GMT Message-Id: <202411151557.4AFFvoOi094544@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 006e4c4279f0 - 2024Q4 - www/gitlab: use %%PREFIX%% in the startup script for shell path List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 006e4c4279f0c3e175c313d2b90247211cb5806c Auto-Submitted: auto-generated The branch 2024Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=006e4c4279f0c3e175c313d2b90247211cb5806c commit 006e4c4279f0c3e175c313d2b90247211cb5806c Author: Matthias Fechner AuthorDate: 2024-11-02 07:53:13 +0000 Commit: Matthias Fechner CommitDate: 2024-11-15 15:56:43 +0000 www/gitlab: use %%PREFIX%% in the startup script for shell path (cherry picked from commit 5f90abc080394f7538254477c5865914403f75b4) --- www/gitlab/files/gitlab.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/gitlab/files/gitlab.in b/www/gitlab/files/gitlab.in index 0d22bbc45081..3087d86fb25a 100644 --- a/www/gitlab/files/gitlab.in +++ b/www/gitlab/files/gitlab.in @@ -94,7 +94,7 @@ gitlab_pages_dir=$(cd $app_root/../gitlab-pages 2> /dev/null && pwd) gitlab_pages_pid_path="$pid_path/gitlab-pages.pid" gitlab_pages_options="-pages-domain example.com -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090" gitlab_pages_log="$app_root/log/gitlab-pages.log" -shell_path="/usr/local/bin/bash" +shell_path="%%PREFIX%%/bin/bash" gitaly_enabled=true gitaly_dir="%%PREFIX%%/share/gitaly" gitaly_pid_path="$pid_path/gitaly.pid"