gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'workhorse_proxy_headers_timeout' into 'master' 

Add proxy_headers_timeout setting for gitlab-workhorse.

Fixes #1068 

See merge request !610
This commit is contained in:
Marin Jankovski 2016-01-21 09:48:58 +00:00
parent 88c2a5ee38 0b344879f6
commit d3de62c54b
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
files/gitlab-config-template/gitlab.rb.template
View File

@ -297,21 +297,22 @@ external_url 'GENERATED_EXTERNAL_URL'
# gitlab_rails['smtp_ca_path'] = "/etc/ssl/certs"
# gitlab_rails['smtp_ca_file'] = "/etc/ssl/certs/ca-certificates.crt"
##########################
# GitLab git http server #
##########################
# see https://gitlab.com/gitlab-org/gitlab-git-http-server/blob/master/README.md
####################
# GitLab Workhorse #
####################
# see https://gitlab.com/gitlab-org/gitlab-workhorse/blob/master/README.md
# gitlab_git_http_server['enable'] = true
# gitlab_git_http_server['ha'] = false
# gitlab_git_http_server['repo_root'] = "/var/opt/gitlab/git-data/repositories"
# gitlab_git_http_server['listen_network'] = "unix"
# gitlab_git_http_server['listen_umask'] = 000
# gitlab_git_http_server['listen_addr'] = "/var/opt/gitlab/gitlab-git-http-server/socket"
# gitlab_git_http_server['auth_backend'] = "http://localhost:8080"
# gitlab_git_http_server['pprof_listen_addr'] = "''" # put an empty string on the command line
# gitlab_git_http_server['dir'] = "/var/opt/gitlab/gitlab-git-http-server"
# gitlab_git_http_server['log_dir'] = "/var/log/gitlab/gitlab-git-http-server"
# gitlab_workhorse['enable'] = true
# gitlab_workhorse['ha'] = false
# gitlab_workhorse['listen_network'] = "unix"
# gitlab_workhorse['listen_umask'] = 000
# gitlab_workhorse['listen_addr'] = "/var/opt/gitlab/gitlab-workhorse/socket"
# gitlab_workhorse['auth_backend'] = "http://localhost:8080"
# gitlab_workhorse['auth_socket'] = "''" # the empty string is the default in gitlab-workhorse option parser
# gitlab_workhorse['pprof_listen_addr'] = "''" # put an empty string on the command line
# gitlab_workhorse['dir'] = "/var/opt/gitlab/gitlab-workhorse"
# gitlab_workhorse['log_dir'] = "/var/log/gitlab/gitlab-workhorse"
# gitlab_workhorse['proxy_headers_timeout'] = "1m0s"
###############
# GitLab user #

1
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -380,6 +380,7 @@ default['gitlab']['gitlab-workhorse']['auth_socket'] = "''" # the empty string i
default['gitlab']['gitlab-workhorse']['pprof_listen_addr'] = "''" # put an empty string on the command line
default['gitlab']['gitlab-workhorse']['dir'] = "/var/opt/gitlab/gitlab-workhorse"
default['gitlab']['gitlab-workhorse']['log_dir'] = "/var/log/gitlab/gitlab-workhorse"
default['gitlab']['gitlab-workhorse']['proxy_headers_timeout'] = nil
####
# mailroom

5
files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-workhorse-run.erb
View File

@ -20,4 +20,7 @@ exec chpst -P \
-authBackend <%= node['gitlab']['gitlab-workhorse']['auth_backend'] %> \
-authSocket <%= node['gitlab']['gitlab-workhorse']['auth_socket'] %> \
-documentRoot /opt/gitlab/embedded/service/gitlab-rails/public \
-pprofListenAddr <%= node['gitlab']['gitlab-workhorse']['pprof_listen_addr'] %>
-pprofListenAddr <%= node['gitlab']['gitlab-workhorse']['pprof_listen_addr'] %>\
<% if node['gitlab']['gitlab-workhorse']['proxy_headers_timeout'] %>
-proxyHeadersTimeout <%= node['gitlab']['gitlab-workhorse']['proxy_headers_timeout'] %>
<% end %>