summaryrefslogtreecommitdiff
path: root/lib/mix/tasks
diff options
context:
space:
mode:
authorLain Soykaf <lain@lain.com>2021-12-26 16:41:17 +0100
committerLain Soykaf <lain@lain.com>2021-12-26 16:41:17 +0100
commit6efbd088546d7b95126b3100bca57b41e9482211 (patch)
treeefc8663deebf8df648e2c3ccb657742ce102d823 /lib/mix/tasks
parent4e98ba3c3a96548fe6d7fa8705898c660b788fea (diff)
parent2e2fb5f8026a8d70f5d64dcc94f8253a5db24020 (diff)
downloadpleroma-6efbd088546d7b95126b3100bca57b41e9482211.tar.gz
pleroma-6efbd088546d7b95126b3100bca57b41e9482211.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch
Diffstat (limited to 'lib/mix/tasks')
-rw-r--r--lib/mix/tasks/pleroma/instance.ex2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index da27a99d0..d98cb8e37 100644
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -199,6 +199,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
jwt_secret = :crypto.strong_rand_bytes(64) |> Base.encode64() |> binary_part(0, 64)
signing_salt = :crypto.strong_rand_bytes(8) |> Base.encode64() |> binary_part(0, 8)
+ lv_signing_salt = :crypto.strong_rand_bytes(8) |> Base.encode64() |> binary_part(0, 8)
{web_push_public_key, web_push_private_key} = :crypto.generate_key(:ecdh, :prime256v1)
template_dir = Application.app_dir(:pleroma, "priv") <> "/templates"
@@ -217,6 +218,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
secret: secret,
jwt_secret: jwt_secret,
signing_salt: signing_salt,
+ lv_signing_salt: lv_signing_salt,
web_push_public_key: Base.url_encode64(web_push_public_key, padding: false),
web_push_private_key: Base.url_encode64(web_push_private_key, padding: false),
db_configurable?: db_configurable?,