From nobody Mon Jul 11 10:56:06 2022 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 7FB331D0AB35; Mon, 11 Jul 2022 10:56:06 +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 4LhLQt30Npz3S0T; Mon, 11 Jul 2022 10:56:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657536966; 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=GyA/jrJxLzQv59+eiQmTbt7b0Upwm3BDc006KNxHI5I=; b=Ox7nr9FpzIOBjIOlLQTCeXJ+owpvlzIX8OQ4XFVLgHDZhJs/3DUpPIJWDXYY5UXRoAhyHd cfhFzYYCrJaninnBXZ5KuO6cZ4mmxS0i0ZW2ATqq2V6AHe1DPAZXjTqDU7yvRbtcIg6Pui TpKwz6NrzofO10TlWSWg5C5D1rLoEzm4x1SACGRAGdCNF/ibMfzPSBSjYViOUmka3/Wynl SsX8RHdPbJeZ0UNjVDscdu1ssW0di5WtRGdOxljOEU4jjnhrZOtT75SQMrUTRVGvIA9tDM C18r51DnMDBBQ4lLOIZpc6x3hE/tRcJabNXDrqtkf09wUHocybJnII8td3ig4A== 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 4LhLQt22p5z11Tp; Mon, 11 Jul 2022 10:56:06 +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 26BAu6iW067940; Mon, 11 Jul 2022 10:56:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26BAu6ow067939; Mon, 11 Jul 2022 10:56:06 GMT (envelope-from git) Date: Mon, 11 Jul 2022 10:56:06 GMT Message-Id: <202207111056.26BAu6ow067939@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: 3a47b941542f - 2022Q3 - www/gitlab-ce: provide a working database.yml.sample file 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: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: 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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 3a47b941542f5163c9a54f985f1215d79a10aacf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657536966; 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=GyA/jrJxLzQv59+eiQmTbt7b0Upwm3BDc006KNxHI5I=; b=nmG95H2OTMVDMcb16z/svpbTpyi/Gx/HM/pQzd3xGela7PfOsL53CjNt0MdSTyfY31X2c5 EOcwUYlLepqXwCO4G9u1IQsRWJZCFGF1wDU7SSTCo9rFwkYDW+vPminSpbTik6pUVdwijb 9yMkkE1TzE+9iFGim5d2AztZypFP9yvKX0TjsmNVNWvI94YUOgzLyJzojqOhOezrWCgEft pTY+Hp3y8zdONSMQFwSVZlturpgPzlFFSUrNu9hm0TnH/nW9icW8rEQU7csHVhqz4JezCn f5k0NlfySnXCou3+la4OVo2LAbICDoCjG3f3EVPeLkOFfbjaHfYR6JuBcVm3kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657536966; a=rsa-sha256; cv=none; b=hJGApikEFZflGKHHGcQ8TobfK074pXECv1Ty9hTjt4lTrNYng6rDL1sRdj4XD7tCxWKsht OjquxbNAwEWweXH7Y6SvOHcr+I/y7PmLxlbeGXv3cUutvFh/0maBLTc9wKQWxCiij0iP2d p5xnLBwyHrm9N5BCJLa/EOWl5Cs0E2c4lx7MPRcIVCNmr1yLNNEmAxSZFHJMNjCv/LlMLu CU6Rv5aZ6MMwiNJtSW+f8TPrjPoNe69Dr6cydZ9AAukaqFW0vsRdCSd3/O6YTJ3he7NZcK erfnlGAb14ripCAQqOgZJ0pNQkRIrN2z1L82gC6Gi/97xJI/eqcVXX/D35zeBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a47b941542f5163c9a54f985f1215d79a10aacf commit 3a47b941542f5163c9a54f985f1215d79a10aacf Author: Matthias Fechner AuthorDate: 2022-07-01 16:23:45 +0000 Commit: Matthias Fechner CommitDate: 2022-07-11 08:28:09 +0000 www/gitlab-ce: provide a working database.yml.sample file This fixes a problem with my vagrant test setup. Gitlab changed the database.yml syntax, the new sample file reflects now these changes. No need to change anything for an already existing installation. (cherry picked from commit 62ae71fdfa1a277bb21d6c4fee285e379da3e704) --- .../files/patch-config_database.yml.postgresql | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/www/gitlab-ce/files/patch-config_database.yml.postgresql b/www/gitlab-ce/files/patch-config_database.yml.postgresql new file mode 100644 index 000000000000..0171f74c45b2 --- /dev/null +++ b/www/gitlab-ce/files/patch-config_database.yml.postgresql @@ -0,0 +1,55 @@ +--- config/database.yml.postgresql.orig 2022-07-01 16:12:26 UTC ++++ config/database.yml.postgresql +@@ -18,13 +18,6 @@ production: + # port: 8600 + # record: secondary.postgresql.service.consul + # interval: 300 +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_production +- username: git +- password: "secure password" +- host: localhost + + # + # Development specific +@@ -39,13 +32,6 @@ development: + host: localhost + variables: + statement_timeout: 15s +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_development +- username: postgres +- password: "secure password" +- host: localhost + + # + # Staging specific +@@ -58,13 +44,6 @@ staging: + username: git + password: "secure password" + host: localhost +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_staging +- username: git +- password: "secure password" +- host: localhost + + # Warning: The database defined as "test" will be erased and + # re-generated from your development database when you run "rake". +@@ -80,10 +59,3 @@ test: &test + prepared_statements: false + variables: + statement_timeout: 15s +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_test +- username: postgres +- password: +- host: localhost