diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2015-12-29 12:58:32 +0100 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2015-12-29 12:58:32 +0100 |
| commit | dddb54f0b47f35ff6e42c1823c0f1385bb6ae30a (patch) | |
| tree | 5040453a0a232c2a7c2a597d4f3fbd5dc7b40cbb | |
| parent | 58bc4b72d519d971be7c3eb80f174d9e22f2a1b2 (diff) | |
| download | gitlab-ce-crosslink-env-docs.tar.gz | |
Fix link, filename and crosslink to omnibus docs.crosslink-env-docs
| -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 d82ff8b908b..4162cde6dc1 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/environmental_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 d7f5cb7c21f..5043e69db8d 100644 --- a/doc/administration/enviroment_variables.md +++ b/doc/administration/environment_variables.md @@ -39,7 +39,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). |