diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-15 17:29:38 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-15 17:29:38 -0700 |
| commit | 80eb84e843cdca51bbf4ebda180f4de41351b9c4 (patch) | |
| tree | d6cd7012210477c6e17322b2d19b8a1aad61ca44 /doc/install | |
| parent | e4880d07d2aa447425d0b7dc3656e84de08006c0 (diff) | |
| parent | 1eb478ba54206cca53653e7a579aa1a36fb03315 (diff) | |
| download | volse-hubzilla-80eb84e843cdca51bbf4ebda180f4de41351b9c4.tar.gz volse-hubzilla-80eb84e843cdca51bbf4ebda180f4de41351b9c4.tar.bz2 volse-hubzilla-80eb84e843cdca51bbf4ebda180f4de41351b9c4.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'doc/install')
| -rw-r--r-- | doc/install/sample-nginx.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf index f53a3d5fb..dd3b63d3b 100644 --- a/doc/install/sample-nginx.conf +++ b/doc/install/sample-nginx.conf @@ -55,7 +55,7 @@ server { ssl_certificate /etc/nginx/ssl/red.example.net.chain.pem; ssl_certificate_key /etc/nginx/ssl/example.net.key; ssl_session_timeout 5m; - ssl_protocols SSLv3 TLSv1; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP; ssl_prefer_server_ciphers on; |