diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-02-03 13:47:19 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-03 13:47:19 +0000 |
| commit | c1faa836f6711695f2105e7405c2ea438382a5a8 (patch) | |
| tree | 708e7212710b0b7b47d3110d0791f10451132a54 /config | |
| parent | 43d8dbaedde9775dc5aeb196430b3a68326a8d09 (diff) | |
| parent | 9fbe9d97ed29288d065232687023edd74649d553 (diff) | |
| download | gitlab-ce-c1faa836f6711695f2105e7405c2ea438382a5a8.tar.gz | |
Merge branch 'improve-environment-variables-doc' into 'master'
Improving the "Environment variables" administration doc
Closes #12829.
/cc @sytses
See merge request !2669
Diffstat (limited to 'config')
| -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' %> |