diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-14 07:23:14 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-14 07:23:14 +0000 |
| commit | 678df59d22165ac91d659901fcbefbd6384c6e87 (patch) | |
| tree | 20182ab013f08cc687db5506063450723b57ab98 | |
| parent | 2723fb5150f54b30657dd7a0bfa88702bc857173 (diff) | |
| parent | 750cfbf38ddc767e48a367697162c9ea6365bc14 (diff) | |
| download | pleroma-678df59d22165ac91d659901fcbefbd6384c6e87.tar.gz | |
Merge branch 'patch-2' into 'develop'
* fix nginx 1.15 warning:
See merge request pleroma/pleroma!213
| -rw-r--r-- | installation/pleroma.nginx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index a0a2d9f51..e9eeb1848 100644 --- 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; |