summaryrefslogtreecommitdiff
path: root/CONFIGURATION.md
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-07-25 07:16:50 +0000
committerlambda <pleromagit@rogerbraun.net>2018-07-25 07:16:50 +0000
commitba72c51a0f6f8a64a24a96c89d4cb8cfcfb7a245 (patch)
tree838d334208c4dadf23b974181c0ad4c17b199f8c /CONFIGURATION.md
parent41b0ecef959df0a1cda71e56e256cacebe48d56f (diff)
parentbc2668bb63aee2c42cdea48782ba5ef291c17b45 (diff)
downloadpleroma-ba72c51a0f6f8a64a24a96c89d4cb8cfcfb7a245.tar.gz
pleroma-ba72c51a0f6f8a64a24a96c89d4cb8cfcfb7a245.zip
Merge branch 'feature/filter_exif' into 'develop'
Feature/filter exif ( solve #187 ) See merge request pleroma/pleroma!237
Diffstat (limited to 'CONFIGURATION.md')
-rw-r--r--CONFIGURATION.md15
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,