From 658edb166fc91e77399ff6022a48076db5404fb1 Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Fri, 7 Dec 2018 15:55:28 +0700
Subject: fix and improve web push; add configuration docs

---
 config/config.md | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'config')

diff --git a/config/config.md b/config/config.md
index 165f5d9f8..2401e9aed 100644
--- a/config/config.md
+++ b/config/config.md
@@ -154,3 +154,11 @@ An example:
 config :pleroma, :mrf_user_allowlist,
   "example.org": ["https://example.org/users/admin"]
 ```
+
+## :web_push_encryption
+
+Web Push Notifications configuration. You could use a mix task `mix web_push.gen.keypair` to generate it.
+
+* ``subject``: a mailto link for the administrative contact. It’s best if this email is not a personal email address, but rather a group email so that if a person leaves an organization, is unavailable for an extended period, or otherwise can’t respond, someone else on the list can.
+* ``public_key``: VAPID public key
+* ``private_key``: VAPID private key
-- 
cgit v1.2.3


From 3b65f316069a7c754d29515ad33b852661fff5ef Mon Sep 17 00:00:00 2001
From: lambda <pleromagit@rogerbraun.net>
Date: Fri, 7 Dec 2018 09:32:59 +0000
Subject: Update config.md

---
 config/config.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.md b/config/config.md
index 2401e9aed..25e0b5012 100644
--- a/config/config.md
+++ b/config/config.md
@@ -157,7 +157,7 @@ config :pleroma, :mrf_user_allowlist,
 
 ## :web_push_encryption
 
-Web Push Notifications configuration. You could use a mix task `mix web_push.gen.keypair` to generate it.
+Web Push Notifications configuration. You can use the mix task `mix web_push.gen.keypair` to generate it.
 
 * ``subject``: a mailto link for the administrative contact. It’s best if this email is not a personal email address, but rather a group email so that if a person leaves an organization, is unavailable for an extended period, or otherwise can’t respond, someone else on the list can.
 * ``public_key``: VAPID public key
-- 
cgit v1.2.3


From ef10e08efe11d6b796a47a41994caf4cb418ca01 Mon Sep 17 00:00:00 2001
From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Fri, 14 Dec 2018 15:06:04 +0000
Subject: Update config.md

---
 config/config.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.md b/config/config.md
index 25e0b5012..d4dad77b1 100644
--- a/config/config.md
+++ b/config/config.md
@@ -155,7 +155,7 @@ config :pleroma, :mrf_user_allowlist,
   "example.org": ["https://example.org/users/admin"]
 ```
 
-## :web_push_encryption
+## :web_push_encryption, :vapid_details
 
 Web Push Notifications configuration. You can use the mix task `mix web_push.gen.keypair` to generate it.
 
-- 
cgit v1.2.3