Fixing ansible build, and email link.

diff --git a/ansible/templates/env b/ansible/templates/env
index 6ffa6819e02e3e1230ac56d17efb00d6882450e0..8b45ef771d290007cfa60044edd75a2d070d5c2d 100644 (file)
--- 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 7ec3c4905f7047c58971f3471bf3664ae10c990c..d8a71794dd548fdb823052bebc51e4c320d02234 100644 (file)
--- 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 50d3feb71beb8c1cf061eb197b9d0b7251103b7e..e15563b0c8ce670befbc0cd956ba3dfbfbcc0780 100644 (file)
--- a/server/src/api/user.rs
+++ b/server/src/api/user.rs
@@ -847,7 +847,7 @@ impl Perform<PasswordResetResponse> for Oper<PasswordReset> {
     // 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!("<h1>Password Reset Request for {}</h1><br><a href={}/password_change/{}>Click here to reset your password</a>", user.name, hostname, &token);
     match send_email(subject, user_email, &user.name, html) {
       Ok(_o) => _o,