diff options
author | kaniini <nenolod@gmail.com> | 2018-08-16 15:23:04 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-08-16 15:23:04 +0000 |
commit | f2fa09c50fde8db4e619872ef6121e90a69324a6 (patch) | |
tree | 4d34037c5fc6d1a3c05a0b061f5279caef1bd671 /CONFIGURATION.md | |
parent | 718882b326f00c8315bca5acc439b92aa37bf021 (diff) | |
parent | 5fbb14f5ecbbd9feeed2a303c2619fbbba07d70e (diff) | |
download | pleroma-f2fa09c50fde8db4e619872ef6121e90a69324a6.tar.gz pleroma-f2fa09c50fde8db4e619872ef6121e90a69324a6.zip |
Merge branch 'develop' into 'patch-2'
# Conflicts:
# mix.exs
Diffstat (limited to 'CONFIGURATION.md')
-rw-r--r-- | CONFIGURATION.md | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/CONFIGURATION.md b/CONFIGURATION.md index 3f0ecafb5..51a76d1b7 100644 --- a/CONFIGURATION.md +++ b/CONFIGURATION.md @@ -13,6 +13,21 @@ Instead, overload the settings by editing the following files: * `dev.secret.exs`: custom additional configuration for `MIX_ENV=dev` * `prod.secret.exs`: custom additional configuration for `MIX_ENV=prod` +## Uploads configuration + +To configure where to upload files, and wether or not +you want to remove automatically EXIF data from pictures +being uploaded. + + config :pleroma, Pleroma.Upload, + uploads: "uploads", + strip_exif: false + +* `uploads`: where to put the uploaded files, relative to pleroma's main directory. +* `strip_exif`: whether or not to remove EXIF data from uploaded pics automatically. + This needs Imagemagick installed on the system ( apt install imagemagick ). + + ## Block functionality config :pleroma, :activitypub, |