From 1f5c672b110e716faafd651f6437db5fc08dedb0 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 2 Nov 2019 13:07:19 -0700 Subject: [PATCH] Fixing ansible build, and email link. --- ansible/templates/env | 4 ++++ docs/goals.md | 1 - server/src/api/user.rs | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ansible/templates/env b/ansible/templates/env index 6ffa6819..8b45ef77 100644 --- a/ansible/templates/env +++ b/ansible/templates/env @@ -8,3 +8,7 @@ RATE_LIMIT_POST=3 RATE_LIMIT_POST_PER_SECOND=600 RATE_LIMIT_REGISTER=1 RATE_LIMIT_REGISTER_PER_SECOND=3600 +SMTP_SERVER={{ smtp_server }} +SMTP_LOGIN={{ smtp_login }} +SMTP_PASSWORD={{ smtp_password }} +SMTP_FROM_ADDRESS={{ smtp_from_address }} diff --git a/docs/goals.md b/docs/goals.md index 7ec3c490..d8a71794 100644 --- a/docs/goals.md +++ b/docs/goals.md @@ -23,7 +23,6 @@ - [Activitypub main](https://www.w3.org/TR/activitypub/) - [Diesel to Postgres data types](https://kotiri.com/2018/01/31/postgresql-diesel-rust-types.html) - [helpful diesel examples](http://siciarz.net/24-days-rust-diesel/) -- [Mastodon public key server example](https://blog.joinmastodon.org/2018/06/how-to-implement-a-basic-activitypub-server/) - [Recursive query for adjacency list for nested comments](https://stackoverflow.com/questions/192220/what-is-the-most-efficient-elegant-way-to-parse-a-flat-table-into-a-tree/192462#192462) - https://github.com/sparksuite/simplemde-markdown-editor - [Markdown-it](https://github.com/markdown-it/markdown-it) diff --git a/server/src/api/user.rs b/server/src/api/user.rs index 50d3feb7..e15563b0 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -847,7 +847,7 @@ impl Perform for Oper { // TODO no i18n support here. let user_email = &user.email.expect("email"); let subject = &format!("Password reset for {}", user.name); - let hostname = Settings::get().hostname; + let hostname = &format!("https://{}", Settings::get().hostname); //TODO add https for now. let html = &format!("

Password Reset Request for {}


Click here to reset your password", user.name, hostname, &token); match send_email(subject, user_email, &user.name, html) { Ok(_o) => _o,