diff options
author | kaniini <nenolod@gmail.com> | 2018-12-06 15:35:30 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-12-06 15:35:30 +0000 |
commit | 776179c2ed72323db245d7eef20054beea0db429 (patch) | |
tree | 0646931e0613773562f6c07b929878b899ffcf53 /lib/mix/tasks | |
parent | ccf0b46dd6a0390a06847b4a1c3eedc8d8e6c916 (diff) | |
parent | 6f36e903b0a8702ec279df29c1d039cb08a574d4 (diff) | |
download | pleroma-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 'lib/mix/tasks')
-rw-r--r-- | lib/mix/tasks/generate_config.ex | 6 | ||||
-rw-r--r-- | lib/mix/tasks/sample_config.eex | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lib/mix/tasks/generate_config.ex b/lib/mix/tasks/generate_config.ex index e3cbbf131..be085d187 100644 --- a/lib/mix/tasks/generate_config.ex +++ b/lib/mix/tasks/generate_config.ex @@ -22,6 +22,8 @@ defmodule Mix.Tasks.GenerateConfig do resultSql = EEx.eval_file("lib/mix/tasks/sample_psql.eex", dbpass: dbpass) + {web_push_public_key, web_push_private_key} = :crypto.generate_key(:ecdh, :prime256v1) + result = EEx.eval_file( "lib/mix/tasks/sample_config.eex", @@ -29,7 +31,9 @@ defmodule Mix.Tasks.GenerateConfig do email: email, name: name, secret: secret, - dbpass: dbpass + dbpass: dbpass, + 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) ) IO.puts( diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex index 462c34636..47b6be729 100644 --- a/lib/mix/tasks/sample_config.eex +++ b/lib/mix/tasks/sample_config.eex @@ -25,6 +25,12 @@ config :pleroma, Pleroma.Repo, hostname: "localhost", pool_size: 10 +# Configure web push notifications +config :web_push_encryption, :vapid_details, + subject: "mailto:<%= email %>", + public_key: "<%= web_push_public_key %>", + private_key: "<%= web_push_private_key %>" + # Enable Strict-Transport-Security once SSL is working: # config :pleroma, :http_security, # sts: true @@ -50,9 +56,9 @@ config :pleroma, Pleroma.Repo, # Configure Openstack Swift support if desired. -# -# Many openstack deployments are different, so config is left very open with -# no assumptions made on which provider you're using. This should allow very +# +# Many openstack deployments are different, so config is left very open with +# no assumptions made on which provider you're using. This should allow very # wide support without needing separate handlers for OVH, Rackspace, etc. # # config :pleroma, Pleroma.Uploaders.Swift, |