aboutsummaryrefslogtreecommitdiffstats
path: root/doc/install
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-15 17:26:07 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-15 17:26:07 -0700
commitcf58122b29b7576a27b0f0561d90b87d9a0623dd (patch)
treecb06b26e88a61c43dc430417b5957cd4dd331501 /doc/install
parent0c5408e22b47880e8e657d4e10f8b39581f2a29a (diff)
parent1eb478ba54206cca53653e7a579aa1a36fb03315 (diff)
downloadvolse-hubzilla-cf58122b29b7576a27b0f0561d90b87d9a0623dd.tar.gz
volse-hubzilla-cf58122b29b7576a27b0f0561d90b87d9a0623dd.tar.bz2
volse-hubzilla-cf58122b29b7576a27b0f0561d90b87d9a0623dd.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/sample-nginx.conf2
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;