From da8282081c8d5f689281f223e824224ccf606511 Mon Sep 17 00:00:00 2001 From: Daenney Date: Fri, 21 Jul 2023 16:22:59 +0200 Subject: [PATCH] [feature] Lower remote media cache config duration (#2007) The old default of 30d can lead to a lot of media getting cached and significant disk usage, even on small or single person instances. A lot of deployments decrease this value, to 15 or even less. This is less of an issue when using object storage, but for local storage which is the more popular deployment option running out of disk space is unpleasant. With GoToSocial's aim to fit in small places, this changes the default to a much more conservative 7 days. In all likelihood people aren't scrolling that far back in their timeline so this change shouldn't result in any issue. Existing deployments will only be affected by this change if the admin hasn't already configured this value, or didn't bootstrap from the example configuration. --- docs/configuration/media.md | 4 ++-- example/config.yaml | 4 ++-- internal/config/defaults.go | 2 +- testrig/config.go | 2 +- 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