Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-01-20 13:49:42 +0300
committerYorick Peterse <yorickpeterse@gmail.com>2016-01-20 13:51:49 +0300
commit21fab4f41317fe3c7acc7f9395cb1222e4a41074 (patch)
tree4b27062a3f7a609e68755656fb4d29dff4b3fb19 /doc/administration/environment_variables.md
parent481644ca7c9f763d4646ad557cc3bcf8f4f71816 (diff)
Use env variables for Unicorn memory limits
This makes it easier for users to use their own limits based on their server configuration.
Diffstat (limited to 'doc/administration/environment_variables.md')
-rw-r--r--doc/administration/environment_variables.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md
index 1eb3a74d304..42a27dcf6d6 100644
--- a/doc/administration/environment_variables.md
+++ b/doc/administration/environment_variables.md
@@ -17,6 +17,8 @@ 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
+GITLAB_UNICORN_MEMORY_MIN | integer | The minimum memory threshold (in bytes) for the Unicorn worker killer
+GITLAB_UNICORN_MEMORY_MAX | integer | The maximum memory threshold (in bytes) for the Unicorn worker killer
## Complete database variables