X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=CONFIGURATION.md;h=51a76d1b7afac9af6da2d6b8918e8ce77310bd2f;hb=3e33479c05c315e04b0947136f1429c79c85c63c;hp=ab0c022115c61464c1948efef87cee68433a4d0d;hpb=63946a6af38642a9b22c5026df5034d9191a8dfe;p=akkoma

diff --git a/CONFIGURATION.md b/CONFIGURATION.md
index ab0c02211..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,
@@ -66,7 +81,8 @@ Restricts the visibility of posts from certain instances.
       media_removal: [],
       media_nsfw: [],
       federated_timeline_removal: [],
-      reject: []
+      reject: [],
+      accept: []
 
 * `media_removal`: posts from these instances will have attachments 
    removed
@@ -75,6 +91,7 @@ Restricts the visibility of posts from certain instances.
 * `federated_timeline_removal`: posts from these instances will be 
    marked as unlisted
 * `reject`: posts from these instances will be dropped
+* `accept`: if not empty, only posts from these instances will be accepted
 
 ### RejectNonPublic