summaryrefslogtreecommitdiff
path: root/installation/pleroma-apache.conf
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-16 17:07:09 +0000
committerlain <lain@soykaf.club>2020-05-16 17:07:09 +0000
commitd15aa9d9503e59b3cd0731394855781f435ec63c (patch)
tree844810415def046a2fc886d0bc1baeb1ff9afb21 /installation/pleroma-apache.conf
parent9cf4c4fa73e68f03791c5cc70505b710be39b677 (diff)
parent3bc1138dd9beec03d2336fa1ad45dd23816f5285 (diff)
downloadpleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.tar.gz
pleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.zip
Merge branch 'develop' into 'remove-twitter-api'
# Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
Diffstat (limited to 'installation/pleroma-apache.conf')
-rw-r--r--installation/pleroma-apache.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf
index b5640ac3d..0d627f2d7 100644
--- a/installation/pleroma-apache.conf
+++ b/installation/pleroma-apache.conf
@@ -32,9 +32,8 @@ CustomLog ${APACHE_LOG_DIR}/access.log combined
<VirtualHost *:443>
SSLEngine on
- SSLCertificateFile /etc/letsencrypt/live/${servername}/cert.pem
+ SSLCertificateFile /etc/letsencrypt/live/${servername}/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/${servername}/privkey.pem
- SSLCertificateChainFile /etc/letsencrypt/live/${servername}/fullchain.pem
# Mozilla modern configuration, tweak to your needs
SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1