summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-12-06 15:35:30 +0000
committerkaniini <nenolod@gmail.com>2018-12-06 15:35:30 +0000
commit776179c2ed72323db245d7eef20054beea0db429 (patch)
tree0646931e0613773562f6c07b929878b899ffcf53 /config
parentccf0b46dd6a0390a06847b4a1c3eedc8d8e6c916 (diff)
parent6f36e903b0a8702ec279df29c1d039cb08a574d4 (diff)
downloadpleroma-776179c2ed72323db245d7eef20054beea0db429.tar.gz
pleroma-776179c2ed72323db245d7eef20054beea0db429.zip
Merge branch 'feature/compat/push-subscriptions' into 'develop'
Web Push Subscriptions See merge request pleroma/pleroma!506
Diffstat (limited to 'config')
-rw-r--r--config/test.exs6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs
index 6f6227c20..ca10a616c 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -27,6 +27,12 @@ config :pleroma, :websub, Pleroma.Web.WebsubMock
config :pleroma, :ostatus, Pleroma.Web.OStatusMock
config :tesla, adapter: Tesla.Mock
+config :web_push_encryption, :vapid_details,
+ subject: "mailto:administrator@example.com",
+ public_key:
+ "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4",
+ private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA"
+
try do
import_config "test.secret.exs"
rescue