commit: 678df59d22165ac91d659901fcbefbd6384c6e87
parent: 2723fb5150f54b30657dd7a0bfa88702bc857173
Author: lambda <pleromagit@rogerbraun.net>
Date: Thu, 14 Jun 2018 07:23:14 +0000
Merge branch 'patch-2' into 'develop'
* fix nginx 1.15 warning:
See merge request pleroma/pleroma!213
Diffstat:
1 file changed, 0 insertions(+), 1 deletion(-)
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
@@ -29,7 +29,6 @@ ssl_session_cache shared:ssl_session_cache:10m;
server {
listen 443 ssl http2;
- ssl on;
ssl_session_timeout 5m;
ssl_trusted_certificate /etc/letsencrypt/live/example.tld/fullchain.pem;