aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorpafcu <pafcu@iki.fi>2014-10-16 16:06:20 +0300
committerpafcu <pafcu@iki.fi>2014-10-16 16:06:20 +0300
commit865f804cfb86f12573ece550e1a7cf28172f6749 (patch)
tree5484d212498eea4ab0e98e531dc06d5623cb8364 /doc
parentaa0aa22b8ad5db1589331e985e82781949985269 (diff)
parente1f88fd15d75f81af5017860b9f197771326c9b7 (diff)
downloadvolse-hubzilla-865f804cfb86f12573ece550e1a7cf28172f6749.tar.gz
volse-hubzilla-865f804cfb86f12573ece550e1a7cf28172f6749.tar.bz2
volse-hubzilla-865f804cfb86f12573ece550e1a7cf28172f6749.zip
Merge pull request #1 from friendica/master
Sync with upstream
Diffstat (limited to 'doc')
-rw-r--r--doc/install/sample-nginx.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf
index f53a3d5fb..f533d8ee0 100644
--- a/doc/install/sample-nginx.conf
+++ b/doc/install/sample-nginx.conf
@@ -55,8 +55,8 @@ 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_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
+ ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+ ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA;
ssl_prefer_server_ciphers on;
fastcgi_param HTTPS on;