From nobody Tue Apr 23 15:30:58 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 4VP5g66JD2z5HTBr; Tue, 23 Apr 2024 15:30:58 +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 4VP5g62dsWz41XV; Tue, 23 Apr 2024 15:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713886258; 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=J/Hn1ZtZZ8pSaj4xGHMbxPkx1KOqU5knLVPUuIOPOpo=; b=kq/Hwk/+gZ0iSVi6XNYOeHnHTpBA8V3QjTBbSjAzQT4bFQTlk7uXgAPVT520OltxCl6auD r1s2NefzkvIVMsdTbBNMIVh5hYRBjfyx3aGkJHcZ1+e6yWoTayy6ANgFviFPtezDCQkeSu l5eFmNKim9rCk3BepjnfYq6vXVWtWNXmjgD+4PCIQbHp8D6a/g8GFN/QY09W5O/zHA/flQ GkkeTujSdqcW9fDXETTN0+/Qe9Yd+i+HNgvnUb7RZqJJiHNsfkFyo8iGNmCEsM50Ye2+nT RKUaRpdwkHGiQwXZJSi2jOuwmhALHYbRoJooQcRcOl6EM/YxyoQcjAczgNTtzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713886258; a=rsa-sha256; cv=none; b=Ppcqrj49PxDd/Uu1JmeQ5LqMVgUG5fLlUlpd4UfDCXJsuiZ609xJ318l9zZQATIW9jEoDd 3sx3STIk8uEZZji3LZFXp6CpoFgr8uBkLDPHOrnsV79aZhI/CTxgigUEAvYqbD/1ABxw97 pSkHH7uud77QGWVbVuZd8Ag/Fy7iTb7XJdR3ZEwRMBiTe0VW4XXG9nEzwmx14JjYy0iBcD axlWz1mMWFe4Poao0I7CE6CgvrSL6qK/BWoWyy+uDWjwznS/0OnLfQwtskCKPBtYV0GbTO 9yYR8XGKAF2rLKMR5GDuYxlXpYmkB6oAZCijTU3lMjOgm2TKoX9NBKRgIgEeiQ== 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=1713886258; 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=J/Hn1ZtZZ8pSaj4xGHMbxPkx1KOqU5knLVPUuIOPOpo=; b=pqroouIoHsk3GYcIhhZg+7hRMEKlqknFplg1qwnChW6k+oHHU8zFAfuFhlg8Z0rfcKBVuP yZkNsceNWdQdhZI4JMXzu5PYQHm8KgDbxJQkqMaNVpuEEHDReEr/M0KjHO8k4GtH0c3zvt yYpZg+WAr1PZ0g0ikOQEoFlj8wLS76sOmP27oG+4522jnTO/Jr9Ct9kfhCzXdEFXQu7AiM uMcC1L8xfLQZXetPfVE7/MLpvwHnDvWcuWKJDi09D8czVl3gUv01oUVrjlY2suGfurB5/j EHVHNmzkTdjADoA4KAn4bfijS9OgiYt2oyFhR3XLaEDYyAEZZcXlTZi44fbdmg== 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 4VP5g62GLkzcYP; Tue, 23 Apr 2024 15:30:58 +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 43NFUw51045999; Tue, 23 Apr 2024 15:30:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NFUwvL045996; Tue, 23 Apr 2024 15:30:58 GMT (envelope-from git) Date: Tue, 23 Apr 2024 15:30:58 GMT Message-Id: <202404231530.43NFUwvL045996@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: a539a2d6519c - 2024Q2 - www/gitlab-pages: correct path in sample config to gitlab installation 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/2024Q2 X-Git-Reftype: branch X-Git-Commit: a539a2d6519c43939b4aa70d2309a570d2393180 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=a539a2d6519c43939b4aa70d2309a570d2393180 commit a539a2d6519c43939b4aa70d2309a570d2393180 Author: Matthias Fechner AuthorDate: 2024-04-21 16:55:15 +0000 Commit: Matthias Fechner CommitDate: 2024-04-23 15:30:42 +0000 www/gitlab-pages: correct path in sample config to gitlab installation (cherry picked from commit d4351133bbb6aae72ccea02b19223303fe02be56) --- www/gitlab-pages/files/patch-gitlab-pages.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/gitlab-pages/files/patch-gitlab-pages.conf.sample b/www/gitlab-pages/files/patch-gitlab-pages.conf.sample index d73eae49370e..4921b5462ae6 100644 --- a/www/gitlab-pages/files/patch-gitlab-pages.conf.sample +++ b/www/gitlab-pages/files/patch-gitlab-pages.conf.sample @@ -2,8 +2,8 @@ +++ gitlab-pages.conf.sample @@ -0,0 +1,6 @@ +listen-http=:8090 -+pages-root=%%PREFIX%%/www/gitlab-ce/shared/pages -+api-secret-key=%%PREFIX%%/www/gitlab-ce/.gitlab_pages_secret ++pages-root=%%PREFIX%%/www/gitlab/shared/pages ++api-secret-key=%%PREFIX%%/www/gitlab/.gitlab_pages_secret +pages-domain=pages.example.com +internal-gitlab-server=https://gitlab.example.com +