tjh.dev
1From 054e2e2092e3f20267a5d2046978df6d33c72712 Mon Sep 17 00:00:00 2001
2From: Yaya <mak@nyantec.com>
3Date: Tue, 23 May 2023 13:49:18 +0000
4Subject: [PATCH] Remove unsupported database names
5
6The only supported ones are main, ci, main_clusterwide.
7---
8 config/database.yml.postgresql | 37 ----------------------------------
9 1 file changed, 37 deletions(-)
10
11diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
12index da9f458ff..2d6d44e37 100644
13--- a/config/database.yml.postgresql
14+++ b/config/database.yml.postgresql
15@@ -26,13 +26,6 @@ production:
16 username: git
17 password: "secure password"
18 host: localhost
19- geo:
20- adapter: postgresql
21- encoding: unicode
22- database: gitlabhq_geo_production
23- username: git
24- password: "secure password"
25- host: localhost
26
27 #
28 # Development specific
29@@ -57,13 +50,6 @@ development:
30 host: localhost
31 variables:
32 statement_timeout: 15s
33- geo:
34- adapter: postgresql
35- encoding: unicode
36- database: gitlabhq_geo_development
37- username: postgres
38- password: "secure password"
39- host: localhost
40
41 #
42 # Staging specific
43@@ -84,13 +70,6 @@ staging:
44 username: git
45 password: "secure password"
46 host: localhost
47- geo:
48- adapter: postgresql
49- encoding: unicode
50- database: gitlabhq_geo_staging
51- username: git
52- password: "secure password"
53- host: localhost
54
55 # Warning: The database defined as "test" will be erased and
56 # re-generated from your development database when you run "rake".
57@@ -119,19 +98,3 @@ test: &test
58 reaping_frequency: nil
59 variables:
60 statement_timeout: 15s
61- geo:
62- adapter: postgresql
63- encoding: unicode
64- database: gitlabhq_geo_test
65- username: postgres
66- password:
67- host: localhost
68- reaping_frequency: nil
69- embedding:
70- adapter: postgresql
71- encoding: unicode
72- database: gitlabhq_embedding_test
73- username: postgres
74- password:
75- host: localhost
76- reaping_frequency: nil
77--
782.40.1
79