diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-30 23:05:01 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-30 23:05:01 +0000 |
| commit | 65e8d47cfb74e76bf966a0340fd5ced184c74fec (patch) | |
| tree | 4535e1e1fbc7c52573a29e053ec4a025eb511095 /config/config.exs | |
| parent | 1a70d41f8e7ce0eb30242d58077b69816e443c10 (diff) | |
| parent | adffad55028a8c43a6f2fcf43376009a43c25cf7 (diff) | |
| download | pleroma-65e8d47cfb74e76bf966a0340fd5ced184c74fec.tar.gz pleroma-65e8d47cfb74e76bf966a0340fd5ced184c74fec.zip | |
Merge branch 'backendhack' into 'develop'
Flexible Storage Backends
See merge request pleroma/pleroma!304
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index d234d23eb..fa36209ac 100644 --- a/config/config.exs +++ b/config/config.exs @@ -11,10 +11,12 @@ config :pleroma, ecto_repos: [Pleroma.Repo] config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes config :pleroma, Pleroma.Upload, - uploads: "uploads", - strip_exif: false, - use_s3: false, - s3_bucket: nil + uploader: Pleroma.Uploaders.Local, + strip_exif: false + +config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" + +config :pleroma, Pleroma.Uploaders.S3, s3_bucket: nil config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"] |