Merge remote-tracking branch 'upstream/develop' into block-behavior

[akkoma] / installation / caddyfile-pleroma.example

diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example
index 03ff000b6c00b6ec6344f108d9b4ccdf3fbaade9..7985d9c6746a6c2d2ef9bd682f184f013de11f93 100644 (file)
--- a/installation/caddyfile-pleroma.example
+++ b/installation/caddyfile-pleroma.example
@@ -10,7 +10,9 @@ example.tld  {
 
   gzip
 
-  proxy / localhost:4000 {
+  # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only
+  # and `localhost.` resolves to [::0] on some systems: see issue #930
+  proxy / 127.0.0.1:4000 {
     websocket
     transparent
   }
@@ -23,6 +25,11 @@ example.tld  {
 
   # If you do not want to use the mediaproxy function, remove these lines.
   # To use this directive, you need the http.cache plugin for Caddy.
+  cache {
+    match_path /media
+    default_max_age 720m
+  }
+
   cache {
     match_path /proxy
     default_max_age 720m