summaryrefslogtreecommitdiff
path: root/doc/administration
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2015-12-29 12:58:32 +0100
committerSytse Sijbrandij <sytse@gitlab.com>2015-12-29 12:58:32 +0100
commitdddb54f0b47f35ff6e42c1823c0f1385bb6ae30a (patch)
tree5040453a0a232c2a7c2a597d4f3fbd5dc7b40cbb /doc/administration
parent58bc4b72d519d971be7c3eb80f174d9e22f2a1b2 (diff)
downloadgitlab-ce-dddb54f0b47f35ff6e42c1823c0f1385bb6ae30a.tar.gz
Fix link, filename and crosslink to omnibus docs.crosslink-env-docs
Diffstat (limited to 'doc/administration')
-rw-r--r--doc/administration/environment_variables.md (renamed from doc/administration/enviroment_variables.md)7
1 files changed, 6 insertions, 1 deletions
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).