Merge branch 'improve-example-caddyfile' into 'develop'

Improve example Caddyfile

See merge request pleroma/pleroma!296

diff --git a/config/config.exs b/config/config.exs
index 08d2381b2633a662c0f6c96cfb2ae122bc117ff6..6b1e31398cdba486a2e70b6a37e320d06d3cf0ec 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -72,10 +72,6 @@ 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,
   collapse_message_with_subject: false
 

diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 7dbac620ef2cffe264f3ea00813a44e1b76ee52e..d1ecebf619c6f3d0fed094bf23f7a89301b96b55 100644 (file)
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -172,10 +172,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
               redirectRootLogin: Keyword.get(@instance_fe, :redirect_root_login),
               chatDisabled: !Keyword.get(@instance_chat, :enabled),
               showInstanceSpecificPanel: Keyword.get(@instance_fe, :show_instance_panel),
-              showWhoToFollowPanel: Keyword.get(@instance_fe, :show_who_to_follow_panel),
               scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled),
-              whoToFollowProvider: Keyword.get(@instance_fe, :who_to_follow_provider),
-              whoToFollowLink: Keyword.get(@instance_fe, :who_to_follow_link),
               collapseMessageWithSubject:
                 Keyword.get(@instance_fe, :collapse_message_with_subject)
             }