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

diff --git a/config/config.exs b/config/config.exs
index 3292bf29c..d234d23eb 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -10,7 +10,15 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
 
 config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
 
-config :pleroma, Pleroma.Upload, uploads: "uploads"
+config :pleroma, Pleroma.Upload,
+  uploads: "uploads",
+  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,
@@ -26,6 +34,7 @@ config :logger, :console,
   metadata: [:request_id]
 
 config :mime, :types, %{
+  "application/xml" => ["xml"],
   "application/xrd+xml" => ["xrd+xml"],
   "application/activity+json" => ["activity+json"],
   "application/ld+json" => ["activity+json"]
@@ -49,21 +58,43 @@ config :pleroma, :instance,
   version: version,
   name: "Pleroma",
   email: "example@example.com",
+  description: "A Pleroma instance, an alternative fediverse server",
   limit: 5000,
   upload_limit: 16_000_000,
   registrations_open: true,
   federating: true,
+  allow_relay: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
   public: true,
   quarantined_instances: []
 
-config :pleroma, :activitypub, accept_blocks: true
+config :pleroma, :fe,
+  theme: "pleroma-dark",
+  logo: "/static/logo.png",
+  background: "/static/aurora_borealis.jpg",
+  redirect_root_no_login: "/main/all",
+  redirect_root_login: "/main/friends",
+  show_instance_panel: true,
+  scope_options_enabled: false,
+  collapse_message_with_subject: false
+
+config :pleroma, :activitypub,
+  accept_blocks: true,
+  unfollow_blocked: true,
+  outgoing_blocks: true
+
+config :pleroma, :user, deny_follow_blocked: true
+
+config :pleroma, :mrf_rejectnonpublic,
+  allow_followersonly: false,
+  allow_direct: false
 
 config :pleroma, :mrf_simple,
   media_removal: [],
   media_nsfw: [],
   federated_timeline_removal: [],
-  reject: []
+  reject: [],
+  accept: []
 
 config :pleroma, :media_proxy,
   enabled: false,
@@ -82,6 +113,13 @@ config :pleroma, :gopher,
   ip: {0, 0, 0, 0},
   port: 9999
 
+config :pleroma, :suggestions,
+  enabled: false,
+  third_party_engine:
+    "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}",
+  timeout: 300_000,
+  web: "https://vinayaka.distsn.org/?{{host}}+{{user}}"
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"