diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 6 | ||||
| -rw-r--r-- | config/emoji.txt | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index b9af250c5..0fbca06f3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -543,6 +543,7 @@ config :pleroma, Oban, queues: [ activity_expiration: 10, token_expiration: 5, + filter_expiration: 1, backup: 1, federator_incoming: 50, federator_outgoing: 50, diff --git a/config/description.exs b/config/description.exs index fac5a006e..f84b52a4f 100644 --- a/config/description.exs +++ b/config/description.exs @@ -3224,6 +3224,12 @@ config :pleroma, :config_description, [ type: :string, description: "S3 host", suggestions: ["s3.eu-central-1.amazonaws.com"] + }, + %{ + key: :region, + type: :string, + description: "S3 region (for AWS)", + suggestions: ["us-east-1"] } ] }, diff --git a/config/emoji.txt b/config/emoji.txt index a2c5add2e..52b714ee5 100644 --- a/config/emoji.txt +++ b/config/emoji.txt @@ -1,4 +1,3 @@ firefox, /emoji/Firefox.gif, Gif,Fun blank, /emoji/blank.png, Fun dinosaur, /emoji/dino walking.gif, Gif -external_emoji, https://example.com/emoji.png |