summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.exs5
-rw-r--r--config/test.exs6
2 files changed, 9 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index 0d07fc692..5032b24e6 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -330,7 +330,10 @@ config :pleroma, :mrf_keyword,
config :pleroma, :mrf_subchain, match_actor: %{}
-config :pleroma, :rich_media, enabled: true
+config :pleroma, :rich_media,
+ enabled: true,
+ ignore_hosts: [],
+ ignore_tld: ["local", "localdomain", "lan"]
config :pleroma, :media_proxy,
enabled: false,
diff --git a/config/test.exs b/config/test.exs
index 73a8b82a1..9d441a7f5 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -43,7 +43,11 @@ config :pleroma, Pleroma.Repo,
config :pbkdf2_elixir, rounds: 1
config :tesla, adapter: Tesla.Mock
-config :pleroma, :rich_media, enabled: false
+
+config :pleroma, :rich_media,
+ enabled: false,
+ ignore_hosts: [],
+ ignore_tld: ["local", "localdomain", "lan"]
config :web_push_encryption, :vapid_details,
subject: "mailto:administrator@example.com",