Download as
Browse Code »

Commit b4ab3e512f580e3c06a2447c59980ea65563a9b9

Authored by Jacob Vosmaer
1 parent c27493e9
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

It is called ssl_session_timeout, not ssl_timeout

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @b4ab3e5
@@ -250,7 +250,7 @@ default['gitlab']['nginx']['ssl_ciphers'] = "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-R @@ -250,7 +250,7 @@ default['gitlab']['nginx']['ssl_ciphers'] = "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-R
250 default['gitlab']['nginx']['ssl_prefer_server_ciphers'] = "on" 250 default['gitlab']['nginx']['ssl_prefer_server_ciphers'] = "on"
251 default['gitlab']['nginx']['ssl_protocols'] = "TLSv1 TLSv1.1 TLSv1.2" # recommended by https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html 251 default['gitlab']['nginx']['ssl_protocols'] = "TLSv1 TLSv1.1 TLSv1.2" # recommended by https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
252 default['gitlab']['nginx']['ssl_session_cache'] = "shared:SSL:10m" # recommended in http://nginx.org/en/docs/http/ngx_http_ssl_module.html 252 default['gitlab']['nginx']['ssl_session_cache'] = "shared:SSL:10m" # recommended in http://nginx.org/en/docs/http/ngx_http_ssl_module.html
253 -default['gitlab']['nginx']['ssl_timeout'] = "5m" # default according to http://nginx.org/en/docs/http/ngx_http_ssl_module.html 253 +default['gitlab']['nginx']['ssl_session_timeout'] = "5m" # default according to http://nginx.org/en/docs/http/ngx_http_ssl_module.html
254 default['gitlab']['nginx']['listen_address'] = '*' 254 default['gitlab']['nginx']['listen_address'] = '*'
255 255
256 ### 256 ###
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
  Diff comments   View file @b4ab3e5
@@ -48,7 +48,7 @@ server { @@ -48,7 +48,7 @@ server {
48 ssl_prefer_server_ciphers <%= @ssl_prefer_server_ciphers %>; 48 ssl_prefer_server_ciphers <%= @ssl_prefer_server_ciphers %>;
49 ssl_protocols <%= @ssl_protocols %>; 49 ssl_protocols <%= @ssl_protocols %>;
50 ssl_session_cache <%= @ssl_session_cache %>; 50 ssl_session_cache <%= @ssl_session_cache %>;
51 - ssl_timeout <%= @ssl_timeout %>; 51 + ssl_session_timeout <%= @ssl_session_timeout %>;
52 <% end %> 52 <% end %>
53 53
54 # Increase this if you want to upload large attachments 54 # Increase this if you want to upload large attachments