X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=d234d23ebcb59ab5de1bf2dd9973f6076534ae00;hb=e95d958b525cd0a448d38753099bbf7a4f30ba90;hp=ee30969e86d3e7e16a5f4b7782021543b7bb3e7d;hpb=38361e7b5e24cbbd4654bd76fce4b3c66562ab59;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index ee30969e8..d234d23eb 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -12,10 +12,14 @@ config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
 
 config :pleroma, Pleroma.Upload,
   uploads: "uploads",
-  strip_exif: false
+  strip_exif: false,
+  use_s3: false,
+  s3_bucket: nil
 
 config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
 
+config :pleroma, :uri_schemes, additionnal_schemes: []
+
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
   url: [host: "localhost"],
@@ -59,6 +63,7 @@ config :pleroma, :instance,
   upload_limit: 16_000_000,
   registrations_open: true,
   federating: true,
+  allow_relay: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
   public: true,
   quarantined_instances: []
@@ -70,11 +75,8 @@ config :pleroma, :fe,
   redirect_root_no_login: "/main/all",
   redirect_root_login: "/main/friends",
   show_instance_panel: true,
-  show_who_to_follow_panel: false,
-  who_to_follow_provider:
-    "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}",
-  who_to_follow_link: "https://vinayaka.distsn.org/?{{host}}+{{user}}",
-  scope_options_enabled: false
+  scope_options_enabled: false,
+  collapse_message_with_subject: false
 
 config :pleroma, :activitypub,
   accept_blocks: true,