summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2021-02-02 12:16:49 -0600
committerMark Felder <feld@feld.me>2021-02-02 12:16:49 -0600
commitc118bdb8f0ab071ec99577826790dfc18057975c (patch)
treed23800982b8c6415f781937f649c3ecfe0c1bdd1 /config
parentd0c2159b773de4fe4eb13dd4925a912c1b89c69c (diff)
parent6a2d3fb9a3775fc0e167c71bb8a8fba3608b2f17 (diff)
downloadpleroma-c118bdb8f0ab071ec99577826790dfc18057975c.tar.gz
pleroma-c118bdb8f0ab071ec99577826790dfc18057975c.zip
Merge branch 'develop' into a1batross-develop-patch-62810
Diffstat (limited to 'config')
-rw-r--r--config/description.exs6
1 files changed, 6 insertions, 0 deletions
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"]
}
]
},