Update syntax of database config
The format we used for the database config YAML file is deprecated, and will no longer be supported starting with GitLab 15.0. cf. https://gitlab.com/gitlab-org/gitlab/-/issues/338182 The new format is described in the upstream documentation: https://docs.gitlab.com/ee/development/database/multiple_databases.html#configdatabaseyml
This commit is contained in:
parent
f587e6f183
commit
f52e9a3a85
1 changed files with 32 additions and 28 deletions
60
debian/conf/database.yml
vendored
60
debian/conf/database.yml
vendored
|
@ -2,46 +2,50 @@
|
||||||
# PRODUCTION
|
# PRODUCTION
|
||||||
#
|
#
|
||||||
production:
|
production:
|
||||||
adapter: postgresql
|
main:
|
||||||
host: /var/run/postgresql
|
adapter: postgresql
|
||||||
encoding: unicode
|
host: /var/run/postgresql
|
||||||
database: gitlab_production
|
encoding: unicode
|
||||||
pool: 10
|
database: gitlab_production
|
||||||
# username: git
|
pool: 10
|
||||||
# password:
|
# username: git
|
||||||
# host: localhost
|
# password:
|
||||||
# port: 5432
|
# host: localhost
|
||||||
|
# port: 5432
|
||||||
|
|
||||||
#
|
#
|
||||||
# Development specific
|
# Development specific
|
||||||
#
|
#
|
||||||
development:
|
development:
|
||||||
adapter: postgresql
|
main:
|
||||||
encoding: unicode
|
adapter: postgresql
|
||||||
database: gitlabhq_development
|
encoding: unicode
|
||||||
pool: 5
|
database: gitlabhq_development
|
||||||
username: postgres
|
pool: 5
|
||||||
password:
|
username: postgres
|
||||||
|
password:
|
||||||
|
|
||||||
#
|
#
|
||||||
# Staging specific
|
# Staging specific
|
||||||
#
|
#
|
||||||
staging:
|
staging:
|
||||||
adapter: postgresql
|
main:
|
||||||
encoding: unicode
|
adapter: postgresql
|
||||||
database: gitlabhq_staging
|
encoding: unicode
|
||||||
pool: 5
|
database: gitlabhq_staging
|
||||||
username: postgres
|
pool: 5
|
||||||
password:
|
username: postgres
|
||||||
|
password:
|
||||||
|
|
||||||
# Warning: The database defined as "test" will be erased and
|
# Warning: The database defined as "test" will be erased and
|
||||||
# re-generated from your development database when you run "rake".
|
# re-generated from your development database when you run "rake".
|
||||||
# Do not set this db to the same as development or production.
|
# Do not set this db to the same as development or production.
|
||||||
test: &test
|
test: &test
|
||||||
adapter: postgresql
|
main:
|
||||||
encoding: unicode
|
adapter: postgresql
|
||||||
host: /var/run/postgresql
|
encoding: unicode
|
||||||
database: gitlab_test
|
host: /var/run/postgresql
|
||||||
pool: 5
|
database: gitlab_test
|
||||||
#username: postgres
|
pool: 5
|
||||||
password:
|
#username: postgres
|
||||||
|
password:
|
||||||
|
|
Loading…
Reference in a new issue