summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorClaudio Maradonna <penguyman@stronzi.org>2022-04-11 15:10:01 +0200
committerClaudio Maradonna <penguyman@stronzi.org>2022-07-07 06:29:10 +0200
commit43dfa58ebda407a0813d398bee8d0ae3e5c9fd5b (patch)
tree9e6e2a257e43325caf6cc57589a5644f0ccd8b0e /config
parentfa2a6d5d6b24657ddbda4ef11d2e6dbcb59545d3 (diff)
downloadpleroma-43dfa58ebda407a0813d398bee8d0ae3e5c9fd5b.tar.gz
pleroma-43dfa58ebda407a0813d398bee8d0ae3e5c9fd5b.zip
added tests for ipfs uploader. adapted changelog.md accordingly. improved ipfs uploader with external suggestions
fix lint description.exs
Diffstat (limited to 'config')
-rw-r--r--config/description.exs5
-rw-r--r--config/dev.exs4
2 files changed, 3 insertions, 6 deletions
diff --git a/config/description.exs b/config/description.exs
index d87bbb9b8..1fe5f01f0 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -147,7 +147,8 @@ config :pleroma, :config_description, [
type: :string,
description: "GET Gateway URL",
suggestions: [
- "get_gateway_url"
+ "https://ipfs.mydomain.com/<%= cid %>",
+ "https://<%= cid %>.ipfs.mydomain.com/"
]
},
%{
@@ -155,7 +156,7 @@ config :pleroma, :config_description, [
type: :string,
description: "POST Gateway URL",
suggestions: [
- "post_gateway_url"
+ "http://localhost:5001/"
]
}
]
diff --git a/config/dev.exs b/config/dev.exs
index 89a84bf05..ab3e83c12 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -58,10 +58,6 @@ config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
# https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
config :phoenix, :plug_init_mode, :runtime
-config :pleroma, Pleroma.Uploaders.IPFS,
- post_gateway_url: nil,
- get_gateway_url: nil
-
if File.exists?("./config/dev.secret.exs") do
import_config "dev.secret.exs"
else