summaryrefslogtreecommitdiff
path: root/doc/administration
diff options
context:
space:
mode:
Diffstat (limited to 'doc/administration')
-rw-r--r--doc/administration/environment_variables.md (renamed from doc/administration/enviroment_variables.md)14
1 files changed, 11 insertions, 3 deletions
diff --git a/doc/administration/enviroment_variables.md b/doc/administration/environment_variables.md
index d7f5cb7c21f..1eb3a74d304 100644
--- a/doc/administration/enviroment_variables.md
+++ b/doc/administration/environment_variables.md
@@ -9,11 +9,14 @@ But if you prefer to use environment variables we allow that too.
## Supported environment variables
Variable | Type | Explanation
---- | --- | ---
+-------- | ---- | -----------
GITLAB_ROOT_PASSWORD | string | sets the password for the `root` user on installation
GITLAB_HOST | url | hostname of the GitLab server includes http or https
-RAILS_ENV | production/development/staging/test | Rails environment
+RAILS_ENV | production / development / staging / test | Rails environment
DATABASE_URL | url | For example: postgresql://localhost/blog_development?pool=5
+GITLAB_EMAIL_FROM | email | Email address used in the "From" field in mails sent by GitLab
+GITLAB_EMAIL_DISPLAY_NAME | string | Name used in the "From" field in mails sent by GitLab
+GITLAB_EMAIL_REPLY_TO | email | Email address used in the "Reply-To" field in mails sent by GitLab
## Complete database variables
@@ -39,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).