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 pull request #31 from alces/master 

make 'proxy_read_timeout' and 'proxy_connect_timeout' changeable via /etc/gitlab/gitlab.rb
This commit is contained in:
Marin Jankovski 2015-09-10 17:15:30 +02:00
parent 774d46beaa 315af5c61b
commit 286695fd91
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,6 +408,8 @@ external_url 'GENERATED_EXTERNAL_URL'
# nginx['listen_https'] = nil # override only if your reverse proxy internally communicates over HTTP: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/nginx.md#supporting-proxied-ssl
# nginx['custom_gitlab_server_config'] = "location ^~ /foo-namespace/bar-project/raw/ {\n deny all;\n}\n"
# nginx['custom_nginx_config'] = "include /etc/nginx/conf.d/example.conf;"
# nginx['proxy_read_timeout'] = 300
# nginx['proxy_connect_timeout'] = 300
## Advanced settings
# nginx['dir'] = "/var/opt/gitlab/nginx"

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

@ -376,6 +376,8 @@ default['gitlab']['nginx']['listen_port'] = nil # override only if you have a re
default['gitlab']['nginx']['listen_https'] = nil # override only if your reverse proxy internally communicates over HTTP
default['gitlab']['nginx']['custom_gitlab_server_config'] = nil
default['gitlab']['nginx']['custom_nginx_config'] = nil
default['gitlab']['nginx']['proxy_read_timeout'] = 300
default['gitlab']['nginx']['proxy_connect_timeout'] = 300
###
# Logging

4
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-ci-http.conf.erb
View File

@ -68,8 +68,8 @@ server {
## https://github.com/gitlabhq/gitlabhq/issues/694
## Some requests take more than 30 seconds.
proxy_read_timeout 300;
proxy_connect_timeout 300;
proxy_read_timeout <%= @proxy_read_timeout %>;
proxy_connect_timeout <%= @proxy_connect_timeout %>;
proxy_redirect off;
proxy_set_header X-Forwarded-Proto <%= @https ? "https" : "http" %>;

8
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
View File

@ -108,8 +108,8 @@ server {
## https://github.com/gitlabhq/gitlabhq/issues/694
## Some requests take more than 30 seconds.
proxy_read_timeout 300;
proxy_connect_timeout 300;
proxy_read_timeout <%= @proxy_read_timeout %>;
proxy_connect_timeout <%= @proxy_connect_timeout %>;
proxy_redirect off;
proxy_set_header Host $http_host;
@ -133,8 +133,8 @@ server {
## https://github.com/gitlabhq/gitlabhq/issues/694
## Some requests take more than 30 seconds.
proxy_read_timeout 300;
proxy_connect_timeout 300;
proxy_read_timeout <%= @proxy_read_timeout %>;
proxy_connect_timeout <%= @proxy_connect_timeout %>;
proxy_redirect off;
proxy_set_header Host $http_host;

4
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-mattermost-http.conf.erb
View File

@ -55,8 +55,8 @@ server {
## to be safe against BREACH attack.
<%= 'gzip off;' if @https %>
proxy_read_timeout 300;
proxy_connect_timeout 300;
proxy_read_timeout <%= @proxy_read_timeout %>;
proxy_connect_timeout <%= @proxy_connect_timeout %>;
proxy_redirect off;
proxy_set_header X-Forwarded-Proto <%= @https ? "https" : "http" %>;