X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=a5b49a839e9f42fe0f1e5adb4dedb4f5e234411c;hb=646016c403f6ed10f00f9c67b477a231f71aa706;hp=9be1c721f2f1cc5a35fc563b627b2410338400c4;hpb=71bffbf0b7a3f0e245408a977c48a51763021508;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 9be1c721f..a5b49a839 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -112,7 +112,6 @@ config :pleroma, :emoji,
   shortcode_globs: ["/emoji/custom/**/*.png"],
   pack_extensions: [".png", ".gif"],
   groups: [
-    # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
     Custom: ["/emoji/*.png", "/emoji/**/*.png"]
   ],
   default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json",
@@ -254,6 +253,7 @@ config :pleroma, :instance,
   ],
   mrf_transparency: true,
   mrf_transparency_exclusions: [],
+  staff_transparency: [],
   autofollowed_nicknames: [],
   max_pinned_statuses: 1,
   no_attachment_links: true,
@@ -265,7 +265,6 @@ config :pleroma, :instance,
   remote_post_retention_days: 90,
   skip_thread_containment: true,
   limit_to_local_content: :unauthenticated,
-  dynamic_configuration: false,
   user_bio_length: 5000,
   user_name_length: 100,
   max_account_fields: 10,
@@ -427,14 +426,6 @@ config :pleroma, Pleroma.Web.Metadata,
   ],
   unfurl_nsfw: false
 
-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,
-  limit: 40,
-  web: "https://vinayaka.distsn.org"
-
 config :pleroma, :http_security,
   enabled: true,
   sts: false,
@@ -620,6 +611,8 @@ config :pleroma, :web_cache_ttl,
 
 config :pleroma, :modules, runtime_dir: "instance/modules"
 
+config :pleroma, configurable_from_database: false
+
 config :swarm, node_blacklist: [~r/myhtml_.*$/]
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.