diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-02-01 19:10:25 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-01 19:10:46 +0100 |
| commit | 06c0025f16480fce831362317ed6427d51ab3c64 (patch) | |
| tree | 0a38117551b59500425b29f95f90ec0bfabef21f /config/database.yml.env | |
| parent | da8e0f86595299740a344309cb5963854b61c4a6 (diff) | |
| download | gitlab-ce-06c0025f16480fce831362317ed6427d51ab3c64.tar.gz | |
Improving the "Environment variables" administration docimprove-environment-variables-doc
Diffstat (limited to 'config/database.yml.env')
| -rw-r--r-- | config/database.yml.env | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/config/database.yml.env b/config/database.yml.env index b2ff23cb5ab..1e35651c9a6 100644 --- a/config/database.yml.env +++ b/config/database.yml.env @@ -1,9 +1,17 @@ <%= ENV['RAILS_ENV'] %>: + ## Connection information + # Please be aware that the DATABASE_URL environment variable will take + # precedence over the following 6 parameters. For more information, see + # doc/administration/environment_variables.md adapter: <%= ENV['GITLAB_DATABASE_ADAPTER'] || 'postgresql' %> - encoding: <%= ENV['GITLAB_DATABASE_ENCODING'] || 'unicode' %> database: <%= ENV['GITLAB_DATABASE_DATABASE'] || "gitlab_#{ENV['RAILS_ENV']}" %> - pool: <%= ENV['GITLAB_DATABASE_POOL'] || '10' %> username: <%= ENV['GITLAB_DATABASE_USERNAME'] || 'root' %> password: <%= ENV['GITLAB_DATABASE_PASSWORD'] || '' %> host: <%= ENV['GITLAB_DATABASE_HOST'] || 'localhost' %> port: <%= ENV['GITLAB_DATABASE_PORT'] || '5432' %> + + ## Behavior information + # The following parameters will be used even if you're using the DATABASE_URL + # environment variable. + encoding: <%= ENV['GITLAB_DATABASE_ENCODING'] || 'unicode' %> + pool: <%= ENV['GITLAB_DATABASE_POOL'] || '10' %> |