From 7141d8dda1ba15504527d4614d35381468904f3f Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 6 Jun 2019 17:13:40 +0200 Subject: [PATCH] rewrite verification mail --- Rocket.toml.dist | 2 +- dist/templates/email/publish-html.hbs | 30 ++++++++++----------------- dist/templates/email/publish-txt.hbs | 21 ++++++++----------- src/mail.rs | 2 +- 4 files changed, 22 insertions(+), 33 deletions(-) diff --git a/Rocket.toml.dist b/Rocket.toml.dist index a0e2c91..e4fff3c 100644 --- a/Rocket.toml.dist +++ b/Rocket.toml.dist @@ -34,7 +34,7 @@ maintenance_file = "maintenance" [production] base-URI = "https://keys.openpgp.org" -from = "noreply@keys.openpgp.org" +from = "keys.openpgp.org " x-accel-redirect = true token_secret = "generated production secret" token_validity = 3600 diff --git a/dist/templates/email/publish-html.hbs b/dist/templates/email/publish-html.hbs index e09b273..e59f211 100644 --- a/dist/templates/email/publish-html.hbs +++ b/dist/templates/email/publish-html.hbs @@ -2,33 +2,25 @@ - Verify your address: {{userid}} + Verify {{userid}} for your key on {{domain}}

- Hi there, - - someone, presumably you, has uploaded an OpenPGP key on - {{domain}} for the address "{{userid}}". - The key has the following fingerprint: -

+ Hi,

- 

{{primary_fp}}
-

+ this is an automated message from {{domain}}. If you didn't + request this message, please ignore it.

- If it was not you, or this is not your key, please ignore this - email. -

+ OpenPGP key: {{primary_fp}}

- To allow others to find this OpenPGP key from your email address "{{userid}}", - click the link below: -

+ To let others find this key from your email address + "{{userid}}", + please click the link below:

{{uri}} -

- You can find more info about the keys.openpgp.org keyserver at - {{base_uri}}/about/help. -

+ You can find more info at {{domain}}/about. +

+ Greetings from the keys.openpgp.org team diff --git a/dist/templates/email/publish-txt.hbs b/dist/templates/email/publish-txt.hbs index 7557634..b1fc804 100644 --- a/dist/templates/email/publish-txt.hbs +++ b/dist/templates/email/publish-txt.hbs @@ -1,18 +1,15 @@ -Hi there, +Hi, -someone, presumably you, has uploaded an OpenPGP key on {{domain}} for the -address "{{userid}}". +this is an automated message from {{domain}}. If you didn't +request this message, please ignore it. -The OpenPGP key has the following fingerprint: +OpenPGP key: {{primary_fp}} - {{primary_fp}} - -If it was not you, or this is not your key, please ignore this email. - -To allow others to find this OpenPGP key from your email address "{{userid}}", -click the link below: +To let others find this key from your email address "{{userid}}", +please click the link below: {{uri}} -You can find more info about the keys.openpgp.org keyserver at -{{base_uri}}/about/help +You can find more info at {{base_uri}}/about + +Greetings from the keys.openpgp.org team diff --git a/src/mail.rs b/src/mail.rs index eade11e..e3c952f 100644 --- a/src/mail.rs +++ b/src/mail.rs @@ -84,7 +84,7 @@ impl Service { self.send( &vec![userid], - "Please verify your email address", + &format!("Verify {} for your key on {}", userid, self.domain), "verify", ctx, )