git: 62ae71fdfa1a - main - www/gitlab-ce: provide a working database.yml.sample file

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Fri, 08 Jul 2022 07:09:43 UTC
The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=62ae71fdfa1a277bb21d6c4fee285e379da3e704

commit 62ae71fdfa1a277bb21d6c4fee285e379da3e704
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2022-07-01 16:23:45 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
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