From nobody Fri Jul 8 07:09:43 2022 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 1C27C17D547F; Fri, 8 Jul 2022 07:09:44 +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 4LfPY40KfVz3lLS; Fri, 8 Jul 2022 07:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657264184; 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=QkEM5w6pPOofCzKsrQmmURYveIqiD5TEJ6+MpmpxNGo=; b=oZrKowtmkzEHqDKyWDs48WxuZ71n1dTcuRLTk4Ml4g8H9620SbrWuO4w9Xoy0yVZQ2+gKw xqdm+GbpuRcXw99/gm+1WRYla8rF2YVEg0uKn6vrUYQ/OZ+AKFSfFPI4YjbQDepn/FMrqE rzKHM1KL2vJtJfzJoSl0JaklgZap/Q1eCfmlS7wOVVOJ1w1PdgzrMdNYQDi+gLKruJ3uPz ZpC9Ofe1kNaceYXSu8FCmXU+2XMt4nu2ZiFzJHiTgWztK2CUF9M4xpp60pPTwe20k+BqFp iUgg/pVrfqrl6mWK3JovJJS0DtADiE9jcm8MpnPXdN+Kfj1A86TQhpHTSfauYA== 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 4LfPY36Jcfz1C4j; Fri, 8 Jul 2022 07:09:43 +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 26879hKe096197; Fri, 8 Jul 2022 07:09:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26879hbV096196; Fri, 8 Jul 2022 07:09:43 GMT (envelope-from git) Date: Fri, 8 Jul 2022 07:09:43 GMT Message-Id: <202207080709.26879hbV096196@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 62ae71fdfa1a - main - www/gitlab-ce: provide a working database.yml.sample file 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 62ae71fdfa1a277bb21d6c4fee285e379da3e704 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657264184; 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=QkEM5w6pPOofCzKsrQmmURYveIqiD5TEJ6+MpmpxNGo=; b=xmyCrayxpWI9fOpm+40rQkejOqh1L+h+yAz+ZutjFoaglptqQ2D+ym+weBqxn+4Ekf/PSI 2QASV6CkevfCKxsEh4r7KU55EWIsZJ/WRY79YxEbom0uEN5cJzS1CGxAz6KAb2DdKc62yi VldMooMrnBOBS7yTvAZ2tvBTpX05a+BxeDJ754aGvyy+EFWx494LBvMN6JiXhWJLwHIRbb ySrTjd9XDycBi3+DdEZ0cqfE1Y6jk4NcGGo186PjV9kVTfDINOgNJ5xH0smYfutsEcSqzg RYKVe63rVvHz64QbIEuODZYvou5GVZY4m/BWkjn5rm1HDL+uYu/Ycy1VbAQ0Lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657264184; a=rsa-sha256; cv=none; b=MQsfAvGY4jwC/EZOLEcvNcFPXP7Uer0JAE0HX/5E+FgbYNJ/0SzlTBjxRcU/3fGcKoly3s Ij7LHCbJpRiZJm+MPafdL6sjpygh/70A2+WU7MXJ6lyZECeT5stCyM3Yg4LI0UsCGux5IP Skggbf2TrSTNZwGw8px8ZiYR2mz0XvFF4MMcgQNtsgizbNW3o090w/qXpcwWkpzk51j/3O rv7GC9bLg6lIdsUTUrn8+lXJzZj3koDYJa+joUSVqmJWZ06iBTBkZFF5WZftYNlab0cDoo fl0kz6w2n/X1cQqI/fsYD6CjGrSFjY56DDDYP+PdA+FF0rdbUFd6EAsCCR9Tug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=62ae71fdfa1a277bb21d6c4fee285e379da3e704 commit 62ae71fdfa1a277bb21d6c4fee285e379da3e704 Author: Matthias Fechner AuthorDate: 2022-07-01 16:23:45 +0000 Commit: Matthias Fechner CommitDate: 2022-07-08 07:07:35 +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. --- .../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