diff options
| author | Jeff Becker <jeff@i2p.rocks> | 2018-01-24 13:15:54 -0500 |
|---|---|---|
| committer | Jeff Becker <jeff@i2p.rocks> | 2018-01-24 13:15:54 -0500 |
| commit | dffde6631d105949b62c1ff27c22fefcb873b2e8 (patch) | |
| tree | f486f66ae4067ec1bc0dec7f265765b6d35a9c58 /lib/mix/tasks/sample_config.eex | |
| parent | 1e185b9301ec85cd2aaeb1faf075aaa86f733373 (diff) | |
| parent | 0f722a8c223c1953c9c9fb45e73cc9ace92839e2 (diff) | |
| download | pleroma-dffde6631d105949b62c1ff27c22fefcb873b2e8.tar.gz pleroma-dffde6631d105949b62c1ff27c22fefcb873b2e8.zip | |
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
Diffstat (limited to 'lib/mix/tasks/sample_config.eex')
| -rw-r--r-- | lib/mix/tasks/sample_config.eex | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex index 85a7c554e..9330fae2d 100644 --- a/lib/mix/tasks/sample_config.eex +++ b/lib/mix/tasks/sample_config.eex @@ -10,6 +10,11 @@ config :pleroma, :instance, limit: 5000, registrations_open: true +config :pleroma, :media_proxy, + enabled: <%= mediaproxy %>, + redirect_on_failure: true, + base_url: "<%= proxy_url %>" + # Configure your database config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, |