From: lambda <lain@soykaf.club>
Date: Fri, 12 Apr 2019 08:58:46 +0000 (+0000)
Subject: Merge branch 'ssl_trusted_cert' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1b4c4d29a3bff0d316162b6a71b1e7ca0ff12647;p=akkoma

Merge branch 'ssl_trusted_cert' into 'develop'

ssl_trusted_certificate should point to chain.pem if we're demonstrating...

See merge request pleroma/pleroma!996
---

1b4c4d29a3bff0d316162b6a71b1e7ca0ff12647
diff --cc installation/pleroma.nginx
index 8709f2cb7,a0e91f464..cc75d78b2
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@@ -31,13 -28,10 +31,13 @@@ server 
  ssl_session_cache shared:ssl_session_cache:10m;
  
  server {
 +    server_name example.tld;
 +
      listen 443 ssl http2;
 +    listen [::]:443 ssl http2;
      ssl_session_timeout 5m;
  
-     ssl_trusted_certificate   /etc/letsencrypt/live/example.tld/fullchain.pem;
+     ssl_trusted_certificate   /etc/letsencrypt/live/example.tld/chain.pem;
      ssl_certificate           /etc/letsencrypt/live/example.tld/fullchain.pem;
      ssl_certificate_key       /etc/letsencrypt/live/example.tld/privkey.pem;