X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=config%2Fconfig.exs;h=601d9e22765c2d71d963879a7b06889d138e6c90;hb=4258dd8633407587ca1f3dfe275afa6a91be9197;hp=11ee220e737b2054f04f733059164fdee6558e41;hpb=9ef664ffceed15727fd185c4c119025d0ee21e30;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 11ee220e7..601d9e227 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -12,7 +12,7 @@ config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
 
 config :pleroma, Pleroma.Captcha,
   enabled: false,
-  seconds_retained: 180,
+  seconds_valid: 60,
   method: Pleroma.Captcha.Kocaptcha
 
 config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
@@ -186,13 +186,7 @@ config :pleroma, :mrf_simple,
   reject: [],
   accept: []
 
-config :pleroma, :media_proxy,
-  enabled: false,
-  # base_url: "https://cache.pleroma.social",
-  proxy_opts: [
-    # inline_content_types: [] | false | true,
-    # http: [:insecure]
-  ]
+config :pleroma, :media_proxy, enabled: false
 
 config :pleroma, :chat, enabled: true