diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-07 23:49:36 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-07 23:49:36 +0000 |
| commit | 3e4f39116be3ac6954d643ee7b2f4b2c05625e91 (patch) | |
| tree | 88b2ca98dab14648550a25093080a925011e612a /config | |
| parent | 14a762a213db0d00550c1421651ef689249c9c57 (diff) | |
| parent | 754deb26dd7ad9bf431d6d3edc3004b4f27ca8b0 (diff) | |
| download | pleroma-3e4f39116be3ac6954d643ee7b2f4b2c05625e91.tar.gz pleroma-3e4f39116be3ac6954d643ee7b2f4b2c05625e91.zip | |
Merge branch 'feature/custom_media_url' into 'develop'
[Pleroma.Uploaders.Local]: Add configuration for custom url path
See merge request pleroma/pleroma!318
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 b29300c3c..3dd8ef284 100644 --- a/config/config.exs +++ b/config/config.exs @@ -14,7 +14,9 @@ config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, strip_exif: false -config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" +config :pleroma, Pleroma.Uploaders.Local, + uploads: "uploads", + uploads_url: "{{base_url}}/media/{{file}}" config :pleroma, Pleroma.Uploaders.S3, bucket: nil, |