From b4ab3e512f580e3c06a2447c59980ea65563a9b9 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 14 Aug 2014 17:34:07 +0200 Subject: [PATCH] It is called ssl_session_timeout, not ssl_timeout --- files/gitlab-cookbooks/gitlab/attributes/default.rb | 2 +- files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 93facf0..a0fc7f6 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -250,7 +250,7 @@ default['gitlab']['nginx']['ssl_ciphers'] = "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-R default['gitlab']['nginx']['ssl_prefer_server_ciphers'] = "on" default['gitlab']['nginx']['ssl_protocols'] = "TLSv1 TLSv1.1 TLSv1.2" # recommended by https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html default['gitlab']['nginx']['ssl_session_cache'] = "shared:SSL:10m" # recommended in http://nginx.org/en/docs/http/ngx_http_ssl_module.html -default['gitlab']['nginx']['ssl_timeout'] = "5m" # default according to http://nginx.org/en/docs/http/ngx_http_ssl_module.html +default['gitlab']['nginx']['ssl_session_timeout'] = "5m" # default according to http://nginx.org/en/docs/http/ngx_http_ssl_module.html default['gitlab']['nginx']['listen_address'] = '*' ### diff --git a/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb b/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb index 2ec4905..ed71b89 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb @@ -48,7 +48,7 @@ server { ssl_prefer_server_ciphers <%= @ssl_prefer_server_ciphers %>; ssl_protocols <%= @ssl_protocols %>; ssl_session_cache <%= @ssl_session_cache %>; - ssl_timeout <%= @ssl_timeout %>; + ssl_session_timeout <%= @ssl_session_timeout %>; <% end %> # Increase this if you want to upload large attachments -- libgit2 0.21.2