diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-05 10:36:35 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-05 10:36:35 +0100 |
| commit | 7f2127ee4c9c276717ca04a1f43a9e7927b749ab (patch) | |
| tree | f88d52d8ff9754684999269ac2aec34f057a7384 /doc | |
| parent | e6713cd945e68e6732d27d9e335b82abbf226155 (diff) | |
| parent | dddb54f0b47f35ff6e42c1823c0f1385bb6ae30a (diff) | |
| download | gitlab-ce-7f2127ee4c9c276717ca04a1f43a9e7927b749ab.tar.gz | |
Merge remote-tracking branch 'origin/crosslink-env-docs'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README.md | 2 | ||||
| -rw-r--r-- | doc/administration/environment_variables.md (renamed from doc/administration/enviroment_variables.md) | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/README.md b/doc/README.md index d9ef5051e3a..f4553a899d3 100644 --- a/doc/README.md +++ b/doc/README.md @@ -56,7 +56,7 @@ - [Issue closing](customization/issue_closing.md) Customize how to close an issue from commit messages. - [Libravatar](customization/libravatar.md) Use Libravatar for user avatars. - [Log system](logs/logs.md) Log system. -- [Environmental Variables](administration/environment_variables.md) to configure GitLab. +- [Environment Variables](administration/environment_variables.md) to configure GitLab. - [Operations](operations/README.md) Keeping GitLab up and running - [Raketasks](raketasks/README.md) Backups, maintenance, automatic web hook setup and the importing of projects. - [Security](security/README.md) Learn what you can do to further secure your GitLab instance. diff --git a/doc/administration/enviroment_variables.md b/doc/administration/environment_variables.md index 7d8f9d29eef..1eb3a74d304 100644 --- a/doc/administration/enviroment_variables.md +++ b/doc/administration/environment_variables.md @@ -42,7 +42,12 @@ GITLAB_DATABASE_PASSWORD | GITLAB_DATABASE_HOST | localhost GITLAB_DATABASE_PORT | 5432 -## Other variables +## Adding more variables We welcome merge requests to make more settings configurable via variables. Please stick to the naming scheme "GITLAB_#{name 1_settings.rb in upper case}". + +## Omnibus configuration + +It's possible to preconfigure the GitLab image by adding the environment variable: `GITLAB_OMNIBUS_CONFIG` to docker run command. +For more information see the ['preconfigure-docker-container' section in the Omnibus documentation](http://doc.gitlab.com/omnibus/docker/#preconfigure-docker-container). |