summaryrefslogtreecommitdiff
path: root/installation
diff options
context:
space:
mode:
Diffstat (limited to 'installation')
-rwxr-xr-xinstallation/download-mastofe-build.sh2
-rw-r--r--installation/pleroma-apache.conf3
-rw-r--r--installation/pleroma.nginx2
3 files changed, 2 insertions, 5 deletions
diff --git a/installation/download-mastofe-build.sh b/installation/download-mastofe-build.sh
index 7e293867d..ee9e1c217 100755
--- a/installation/download-mastofe-build.sh
+++ b/installation/download-mastofe-build.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
project_id="74"
project_branch="rebase/glitch-soc"
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
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index 7f48b614b..688be3e71 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -90,8 +90,6 @@ server {
proxy_ignore_client_abort on;
proxy_buffering on;
chunked_transfer_encoding on;
- proxy_ignore_headers Cache-Control;
- proxy_hide_header Cache-Control;
proxy_pass http://127.0.0.1:4000;
}
}