From fa7e0c4262f8844bb6224c200f7d41720607fcac Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Fri, 12 Jul 2019 23:53:21 +0300
Subject: Workaround for remote server certificate chain issues

---
 config/config.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 99b500993..eb663f3ec 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -194,6 +194,8 @@ config :pleroma, :http,
   send_user_agent: true,
   adapter: [
     ssl_options: [
+      # Workaround for remote server certificate chain issues
+      partial_chain: &:hackney_connect.partial_chain/1,
       # We don't support TLS v1.3 yet
       versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"]
     ]
-- 
cgit v1.2.3


From 369e9bb42fc907f2e3f92e7e44dc52d6940dc046 Mon Sep 17 00:00:00 2001
From: Ivan Tashkinov <ivant.business@gmail.com>
Date: Sat, 13 Jul 2019 14:49:39 +0300
Subject: [#1041] Rate-limited status actions (per user and per user+status).

---
 config/config.exs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 99b500993..3d48a5584 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -519,7 +519,9 @@ config :http_signatures,
 
 config :pleroma, :rate_limit,
   search: [{1000, 10}, {1000, 30}],
-  app_account_creation: {1_800_000, 25}
+  app_account_creation: {1_800_000, 25},
+  statuses_actions: {10_000, 15},
+  status_id_action: {60_000, 3}
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
-- 
cgit v1.2.3


From 80c46d6d8b84d77d86efc32c1d2af225c1eada33 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Sat, 13 Jul 2019 18:30:45 +0000
Subject: nodeinfo: implement MRF transparency exclusions

---
 config/config.exs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 889238f0f..2ffa8c621 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -240,6 +240,7 @@ config :pleroma, :instance,
     "text/bbcode"
   ],
   mrf_transparency: true,
+  mrf_transparency_exclusions: [],
   autofollowed_nicknames: [],
   max_pinned_statuses: 1,
   no_attachment_links: false,
-- 
cgit v1.2.3