diff options
| author | lain <lain@soykaf.club> | 2018-12-01 09:55:46 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-12-01 09:55:46 +0100 |
| commit | c443c9bd72b04b8a24d904bc20fde0d4ffca71d7 (patch) | |
| tree | 1044379e9e6867ded303f81a6ca49da83e01cfd2 /config/config.exs | |
| parent | 1c67277c8031be2212d6faf84c143ac11462c87b (diff) | |
| parent | 8c3ff06e35e11a40cf4eb35a41a2019b7496e62c (diff) | |
| download | pleroma-c443c9bd72b04b8a24d904bc20fde0d4ffca71d7.tar.gz pleroma-c443c9bd72b04b8a24d904bc20fde0d4ffca71d7.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/config/config.exs b/config/config.exs index 848c9d6cf..12f47389c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -10,18 +10,18 @@ config :pleroma, ecto_repos: [Pleroma.Repo] config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes +# Upload configuration config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, - strip_exif: false + filters: [], + proxy_remote: false, + proxy_opts: [] -config :pleroma, Pleroma.Uploaders.Local, - uploads: "uploads", - uploads_url: "{{base_url}}/media/{{file}}" +config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" config :pleroma, Pleroma.Uploaders.S3, bucket: nil, - public_endpoint: "https://s3.amazonaws.com", - force_media_proxy: false + public_endpoint: "https://s3.amazonaws.com" config :pleroma, Pleroma.Uploaders.MDII, cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi", @@ -150,9 +150,11 @@ config :pleroma, :mrf_simple, config :pleroma, :media_proxy, enabled: false, - redirect_on_failure: true - -# base_url: "https://cache.pleroma.social" + # base_url: "https://cache.pleroma.social", + proxy_opts: [ + # inline_content_types: [] | false | true, + # http: [:insecure] + ] config :pleroma, :chat, enabled: true |