aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--installation/caddyfile-pleroma.example8
-rw-r--r--installation/pleroma-apache.conf15
2 files changed, 17 insertions, 6 deletions
diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example
index 41a7eaa72..f5ecf9d26 100644
--- a/installation/caddyfile-pleroma.example
+++ b/installation/caddyfile-pleroma.example
@@ -1,3 +1,9 @@
+# default Caddyfile config for Pleroma
+#
+# Simple installation instructions:
+# 1. Replace 'pleroma.example.tld' with your instance's domain wherever it appears.
+# 2. Copy this section into your Caddyfile and restart Caddy.
+
pleroma.example.tld {
log /var/log/caddy/pleroma_access.log
errors /var/log/caddy/pleroma_error.log
@@ -9,7 +15,7 @@ pleroma.example.tld {
transparent
}
- tls user@example.tld {
+ tls {
# Remove the rest of the lines in here, if you want to support older devices
key_type p256
ciphers ECDHE-ECDSA-WITH-CHACHA20-POLY1305 ECDHE-RSA-WITH-CHACHA20-POLY1305 ECDHE-ECDSA-AES256-GCM-SHA384 ECDHE-RSA-AES256-GCM-SHA384 ECDHE-ECDSA-AES128-GCM-SHA256 ECDHE-RSA-AES128-GCM-SHA256
diff --git a/installation/pleroma-apache.conf b/installation/pleroma-apache.conf
index 5fc04d69f..10918ed1f 100644
--- a/installation/pleroma-apache.conf
+++ b/installation/pleroma-apache.conf
@@ -1,8 +1,13 @@
-#Example configuration for when Apache httpd and Pleroma are on the same host.
-#Needed modules: define headers proxy proxy_http proxy_wstunnel rewrite ssl
-#This assumes a Debian style Apache config. Put this in /etc/apache2/sites-available
-#Install your TLS certificate, possibly using Let's Encrypt.
-#Replace 'pleroma.example.tld' with your instance's domain wherever it appears
+# default Apache site config for Pleroma
+#
+# needed modules: define headers proxy proxy_http proxy_wstunnel rewrite ssl
+#
+# Simple installation instructions:
+# 1. Install your TLS certificate, possibly using Let's Encrypt.
+# 2. Replace 'pleroma.example.tld' with your instance's domain wherever it appears.
+# 3. This assumes a Debian style Apache config. Copy this file to
+# /etc/apache2/sites-available/ and then add a symlink to it in
+# /etc/apache2/sites-enabled/ by running 'a2ensite pleroma-apache.conf', then restart Apache.
Define servername pleroma.example.tld