diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-12-20 14:22:24 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-12-20 14:22:24 +0000 |
| commit | 35ac549a99f325d2e73c03d7c2951f3d6570b7b4 (patch) | |
| tree | d79e7f5b5d82e3c4098895dcdec2e872ad84fc3e /config | |
| parent | 2a744cdff8a94d92683ab1a16f89bb51112006f8 (diff) | |
| parent | f909aec050498a366d8b0ed6c1b5439b5b0891f1 (diff) | |
| download | pleroma-35ac549a99f325d2e73c03d7c2951f3d6570b7b4.tar.gz pleroma-35ac549a99f325d2e73c03d7c2951f3d6570b7b4.zip | |
Merge branch 'media-proxy' into 'develop'
Media proxy
See merge request pleroma/pleroma!34
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index c4f89c40c..503ce8d64 100644 --- a/config/config.exs +++ b/config/config.exs @@ -47,6 +47,11 @@ config :pleroma, :instance, limit: 5000, registrations_open: true +config :pleroma, :media_proxy, + enabled: false, + redirect_on_failure: true + #base_url: "https://cache.pleroma.social" + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env}.exs" |