summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/configuration/media.md4
-rw-r--r--example/config.yaml4
-rw-r--r--internal/config/defaults.go2
-rw-r--r--testrig/config.go2
4 files changed, 6 insertions, 6 deletions
diff --git a/docs/configuration/media.md b/docs/configuration/media.md
index 7bc3ad6ad..96742ae63 100644
--- a/docs/configuration/media.md
+++ b/docs/configuration/media.md
@@ -37,8 +37,8 @@ media-description-max-chars: 500
#
# If this is set to 0, then media from remote instances will be cached indefinitely.
# Examples: [30, 60, 7, 0]
-# Default: 30
-media-remote-cache-days: 30
+# Default: 7
+media-remote-cache-days: 7
# Int. Max size in bytes of emojis uploaded to this instance via the admin API.
# The default is the same as the Mastodon size limit for emojis (50kb), which allows
diff --git a/example/config.yaml b/example/config.yaml
index a56f4d35e..f95720545 100644
--- a/example/config.yaml
+++ b/example/config.yaml
@@ -478,8 +478,8 @@ media-description-max-chars: 500
#
# If this is set to 0, then media from remote instances will be cached indefinitely.
# Examples: [30, 60, 7, 0]
-# Default: 30
-media-remote-cache-days: 30
+# Default: 7
+media-remote-cache-days: 7
# Int. Max size in bytes of emojis uploaded to this instance via the admin API.
# The default is the same as the Mastodon size limit for emojis (50kb), which allows
diff --git a/internal/config/defaults.go b/internal/config/defaults.go
index dc076bdc7..e3f53adaf 100644
--- a/internal/config/defaults.go
+++ b/internal/config/defaults.go
@@ -71,7 +71,7 @@ var Defaults = Configuration{
MediaVideoMaxSize: 40 * bytesize.MiB,
MediaDescriptionMinChars: 0,
MediaDescriptionMaxChars: 500,
- MediaRemoteCacheDays: 30,
+ MediaRemoteCacheDays: 7,
MediaEmojiLocalMaxSize: 50 * bytesize.KiB,
MediaEmojiRemoteMaxSize: 100 * bytesize.KiB,
diff --git a/testrig/config.go b/testrig/config.go
index 126c5b3d4..c5cbb2c80 100644
--- a/testrig/config.go
+++ b/testrig/config.go
@@ -77,7 +77,7 @@ var testDefaults = config.Configuration{
MediaVideoMaxSize: 41943040, // 40mb
MediaDescriptionMinChars: 0,
MediaDescriptionMaxChars: 500,
- MediaRemoteCacheDays: 30,
+ MediaRemoteCacheDays: 7,
MediaEmojiLocalMaxSize: 51200, // 50kb
MediaEmojiRemoteMaxSize: 102400, // 100kb