realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'update_database_config_syntax' into 'master'

Browse source 
Update syntax of database config (required before 14.x → 15.0 upgrade)

See merge request ruby-team/gitlab!8
This commit is contained in:
Praveen Arimbrathodiyil 2022-07-15 19:01:37 +00:00
commit 3948cf0a2a
1 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
debian/conf/database.yml vendored
View file

@ -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: