diff options
| author | Mark Felder <feld@feld.me> | 2021-02-02 12:01:48 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-02-02 12:01:48 -0600 |
| commit | 28d2917c3a093e19bbaaa749a22cec0079b849b3 (patch) | |
| tree | cb9a5a933acc5d63b9f0fc310aa6f02c7b8af46b /config/description.exs | |
| parent | 9272cef500308862d0d86be329bad7f41c66d4ad (diff) | |
| parent | 6a2d3fb9a3775fc0e167c71bb8a8fba3608b2f17 (diff) | |
| download | pleroma-28d2917c3a093e19bbaaa749a22cec0079b849b3.tar.gz pleroma-28d2917c3a093e19bbaaa749a22cec0079b849b3.zip | |
Merge branch 'develop' into fix/majic-nits
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 6 |
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"] } ] }, |