kotovalexarian-likes-gitlab
/
hagrid-keyserver--hagrid
mirror of https://gitlab.com/hagrid-keyserver/hagrid.git
1
0
Fork 0
Code Releases Activity

rewrite verification mail

This commit is contained in:
Vincent Breitmoser 2019-06-06 17:13:40 +02:00
parent 315a3c6615
commit 7141d8dda1
No known key found for this signature in database
GPG Key ID: 7BD18320DEADFA11
4 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rocket.toml.dist
View File

@ -34,7 +34,7 @@ maintenance_file = "maintenance"
[production]
base-URI = "https://keys.openpgp.org"
from = "noreply@keys.openpgp.org"
from = "keys.openpgp.org <noreply@keys.openpgp.org>"
x-accel-redirect = true
token_secret = "generated production secret"
token_validity = 3600

30
dist/templates/email/publish-html.hbs vendored
View File

@ -2,33 +2,25 @@
<html lang=en>
<head>
<meta charset=utf-8>
<title>Verify your address: {{userid}}</title>
<title>Verify {{userid}} for your key on {{domain}}</title>
</head>
<body>
<p>
Hi there,
someone, presumably you, has uploaded an OpenPGP key on
<a href="{{base_uri}}">{{domain}}</a> for the address "{{userid}}".
The key has the following fingerprint:
</p>
Hi,
<p>
<pre>{{primary_fp}}</pre>
</p>
this is an automated message from <a rel="nofollow" href="{{base_uri}}" style="text-decoration:none; color: #333"><tt>{{domain}}</tt></a>. If you didn't
request this message, please ignore it.
<p>
If it was not you, or this is not your key, please ignore this
email.
</p>
OpenPGP key: <tt>{{primary_fp}}</tt>
<p>
To allow others to find this OpenPGP key from your email address "{{userid}}",
click the link below:
</p>
To let others find this key from your email address
"<a rel="nofollow" href="#" style="text-decoration:none; color: #333">{{userid}}</a>",
please click the link below:
<p>
<a href="{{uri}}">{{uri}}</a>
</p>
<p>
You can find more info about the keys.openpgp.org keyserver at
<a href="{{base_uri}}/about/help">{{base_uri}}/about/help</a>.
</p>
You can find more info at <a href="{{base_uri}}/about">{{domain}}/about</a>.
<p>
Greetings from the <a rel="nofollow" href="{{base_uri}}" style="text-decoration:none; color: #333"><tt>keys.openpgp.org</tt></a> team
</body>
</html>

21
dist/templates/email/publish-txt.hbs vendored
View File

@ -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

2
src/mail.rs
View File

@ -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,
)