diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-08 17:07:59 +0400 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-08 17:07:59 +0400 |
| commit | 69c4026ec147f8b8c5d520f02e2a508189e1a510 (patch) | |
| tree | 5556366f4003ded30e29cfa15e5e7706e26f21c6 /lib/support | |
| parent | 3131d0609cf402d8e92d72c4081f567e96846d15 (diff) | |
| parent | c41e5f5018d059a9c57d2c19088e6c274cc60e10 (diff) | |
Merge pull request #7654 from bbodenmiller/patch-13
update ssl_ciphers
Diffstat (limited to 'lib/support')
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index 0ba9d055c8c..d2aa06fe7f6 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -65,7 +65,7 @@ server { ssl_certificate /etc/nginx/ssl/gitlab.crt; ssl_certificate_key /etc/nginx/ssl/gitlab.key; - ssl_ciphers 'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4'; + ssl_ciphers 'AES256+EECDH:AES256+EDH'; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_session_cache builtin:1000 shared:SSL:10m; |