diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-28 00:29:49 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-28 00:29:49 +0000 |
| commit | 49b165ddc61091fc192e6f8a252c9a02a5fcef2d (patch) | |
| tree | 0e976ea10a0c83d5cbcd185e54d738117c534c31 /config | |
| parent | 5ffaa2bf69679f118af9736d62535cc4eb870709 (diff) | |
| parent | d22f66655b0693ebcf9291f7e443a7d7de2d28c6 (diff) | |
| download | pleroma-49b165ddc61091fc192e6f8a252c9a02a5fcef2d.tar.gz pleroma-49b165ddc61091fc192e6f8a252c9a02a5fcef2d.zip | |
Merge branch 'feature/s3' into 'develop'
S3 support
Closes #65
See merge request pleroma/pleroma!303
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index eaf20e8f9..d234d23eb 100644 --- a/config/config.exs +++ b/config/config.exs @@ -12,7 +12,9 @@ config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes config :pleroma, Pleroma.Upload, uploads: "uploads", - strip_exif: false + strip_exif: false, + use_s3: false, + s3_bucket: nil config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"] |