Skip to content

Commit 5fc732e

Browse files
committed
Add new configuration options for database.yml
1 parent be00b11 commit 5fc732e

File tree

2 files changed

+53
-1
lines changed

2 files changed

+53
-1
lines changed

assets/build/config/database.yml.postgresql

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ production:
2929
# port: 8600
3030
# record: secondary.postgresql.service.consul
3131
# interval: 300
32+
ci:
33+
adapter: postgresql
34+
encoding: unicode
35+
database: gitlabhq_production
36+
database_tasks: false
37+
username: git
38+
password: "secure password"
39+
host: localhost
3240
# geo:
3341
# adapter: postgresql
3442
# encoding: unicode
@@ -50,6 +58,16 @@ development:
5058
host: localhost
5159
variables:
5260
statement_timeout: 15s
61+
ci:
62+
adapter: postgresql
63+
encoding: unicode
64+
database: gitlabhq_development
65+
database_tasks: false
66+
username: postgres
67+
password: "secure password"
68+
host: localhost
69+
variables:
70+
statement_timeout: 15s
5371
# geo:
5472
# adapter: postgresql
5573
# encoding: unicode
@@ -69,6 +87,14 @@ staging:
6987
username: git
7088
password: "secure password"
7189
host: localhost
90+
ci:
91+
adapter: postgresql
92+
encoding: unicode
93+
database: gitlabhq_staging
94+
database_tasks: false
95+
username: git
96+
password: "secure password"
97+
host: localhost
7298
# geo:
7399
# adapter: postgresql
74100
# encoding: unicode
@@ -91,10 +117,28 @@ test: &test
91117
prepared_statements: false
92118
variables:
93119
statement_timeout: 15s
120+
ci:
121+
adapter: postgresql
122+
encoding: unicode
123+
database: gitlabhq_test
124+
database_tasks: false
125+
username: postgres
126+
password:
127+
host: localhost
128+
prepared_statements: false
129+
variables:
130+
statement_timeout: 15s
94131
# geo:
95132
# adapter: postgresql
96133
# encoding: unicode
97134
# database: gitlabhq_geo_test
98135
# username: postgres
99136
# password:
100137
# host: localhost
138+
# embedding:
139+
# adapter: postgresql
140+
# encoding: unicode
141+
# database: gitlabhq_embedding_test
142+
# username: postgres
143+
# password:
144+
# host: localhost

assets/runtime/config/gitlabhq/database.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,12 @@ production:
1212
password: "{{DB_PASS}}"
1313
pool: {{DB_POOL}}
1414
prepared_statements: {{DB_PREPARED_STATEMENTS}}
15-
15+
ci:
16+
adapter: postgresql
17+
encoding: {{DB_ENCODING}}
18+
database: {{DB_NAME}}
19+
database_tasks: false
20+
host: {{DB_HOST}}
21+
port: {{DB_PORT}}
22+
username: {{DB_USER}}
23+
password: "{{DB_PASS}}"

0 commit comments

Comments
 (0)