add GITLAB_WORKHORSE_TIMEOUT env

This commit is contained in:
Mizunashi Mana 2016-03-21 06:17:25 +09:00
parent e85d6febeb
commit 822074576d
3 changed files with 6 additions and 1 deletions

View File

@ -253,6 +253,7 @@ command=/usr/local/bin/gitlab-workhorse
-authBackend http://127.0.0.1:8080{{GITLAB_RELATIVE_URL_ROOT}}
-authSocket ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket
-documentRoot ${GITLAB_INSTALL_DIR}/public
-proxyHeadersTimeout {{GITLAB_WORKHORSE_TIMEOUT}}
user=git
autostart=true
autorestart=true

View File

@ -90,6 +90,8 @@ if [[ -z ${GITLAB_MAX_OBJECT_SIZE} ]]; then
fi
fi
GITLAB_WORKHORSE_TIMEOUT=${GITLAB_WORKHORSE_TIMEOUT:-1m0s}
## ARTIFACTS
GITLAB_ARTIFACTS_ENABLED=${GITLAB_ARTIFACTS_ENABLED:-true}
GITLAB_ARTIFACTS_DIR="${GITLAB_ARTIFACTS_DIR:-$GITLAB_SHARED_DIR/artifacts}"

View File

@ -267,7 +267,9 @@ gitlab_configure_redis() {
gitlab_configure_gitlab_workhorse() {
echo "Configuring gitlab::gitlab-workhorse..."
update_template /etc/supervisor/conf.d/gitlab-workhorse.conf GITLAB_RELATIVE_URL_ROOT
update_template /etc/supervisor/conf.d/gitlab-workhorse.conf \
GITLAB_RELATIVE_URL_ROOT \
GITLAB_WORKHORSE_TIMEOUT
}
gitlab_configure_unicorn() {