diff options
| author | feld <feld@feld.me> | 2021-01-29 17:44:46 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-01-29 17:44:46 +0000 |
| commit | 4e050e51ee6a5dcb3a72e82ce2a1123eec001248 (patch) | |
| tree | 176c69f2f64f56d9bebd6cadfc32748597f2e745 | |
| parent | 7f0787163999fc0ac0c6fcfd0c13f80c5a55266d (diff) | |
| parent | 2048b93929360a2917f160c18176c201e51330a1 (diff) | |
| download | pleroma-4e050e51ee6a5dcb3a72e82ce2a1123eec001248.tar.gz | |
Merge branch 'fix/configdb-missing-s3-region' into 'develop'
ConfigDB descriptions: Add missing :ex_aws, :s3, :region setting
See merge request pleroma/pleroma!3292
| -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"] } ] }, |