blob: 968e618f3121f9b4978fee663b18f7c6d0b6ecfd (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
From 7d833508e3bc4c737834e9edf1c429d36f67a38c Mon Sep 17 00:00:00 2001
From: "M. A" <mak@nyantec.com>
Date: Sat, 25 Jun 2022 13:34:42 +0000
Subject: [PATCH] Remove geo from database.yml
---
config/database.yml.postgresql | 28 ----------------------------
1 file changed, 28 deletions(-)
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index 5329a8e9fd7..a4daab1fd0c 100644
--- a/config/database.yml.postgresql
+++ b/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
--
2.36.0
|
