Merge branch '#9_improve_invite_email' into 'main'
Fix: update email to explain more about Skynet/Compsoc Closes #9 See merge request compsoc1/skynet/ldap/backend!7
This commit is contained in:
commit
49bf65abe5
2 changed files with 24 additions and 5 deletions
|
@ -222,8 +222,8 @@
|
||||||
wantedBy = [ "timers.target" ];
|
wantedBy = [ "timers.target" ];
|
||||||
partOf = [ "${cfg.user}_new_users.service" ];
|
partOf = [ "${cfg.user}_new_users.service" ];
|
||||||
timerConfig = {
|
timerConfig = {
|
||||||
# every hour
|
# every 15 min
|
||||||
OnCalendar = "*-*-* *:15:00";
|
OnCalendar = "*-*-* *:0/15:00";
|
||||||
Unit = "${cfg.user}_update.service";
|
Unit = "${cfg.user}_update.service";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -96,6 +96,18 @@ fn send_mail(config: &Config, record: &Record, auth: &str) -> Result<Response, l
|
||||||
h2 { "Hello from Skynet!" }
|
h2 { "Hello from Skynet!" }
|
||||||
// Substitute in the name of our recipient.
|
// Substitute in the name of our recipient.
|
||||||
p { "Hi " (recipient) "," }
|
p { "Hi " (recipient) "," }
|
||||||
|
p {
|
||||||
|
"As part of the UL Computer Society you get an account on our Skynet cluster."
|
||||||
|
br;
|
||||||
|
"This gives you access to some of teh various services we offer:"
|
||||||
|
ul {
|
||||||
|
li { "Email" }
|
||||||
|
li { "Gitlab" }
|
||||||
|
li { "Linux Webhost" }
|
||||||
|
}
|
||||||
|
br;
|
||||||
|
"The following invite will remain active until the end of year."
|
||||||
|
}
|
||||||
p {
|
p {
|
||||||
"If you are a new member please use the following link:"
|
"If you are a new member please use the following link:"
|
||||||
br;
|
br;
|
||||||
|
@ -113,9 +125,9 @@ fn send_mail(config: &Config, record: &Record, auth: &str) -> Result<Response, l
|
||||||
}
|
}
|
||||||
|
|
||||||
p {
|
p {
|
||||||
"UL Computer Society"
|
|
||||||
br;
|
|
||||||
"Skynet Team"
|
"Skynet Team"
|
||||||
|
br;
|
||||||
|
"UL Computer Society"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -124,6 +136,13 @@ fn send_mail(config: &Config, record: &Record, auth: &str) -> Result<Response, l
|
||||||
r#"
|
r#"
|
||||||
Hi {recipient}
|
Hi {recipient}
|
||||||
|
|
||||||
|
As part of the UL Computer Society you get an account on our Skynet cluster.
|
||||||
|
This gives you access to some of teh various services we offer:
|
||||||
|
* Email
|
||||||
|
* Gitlab
|
||||||
|
* Linux Webhost
|
||||||
|
The following invite will remain active until the end of year.
|
||||||
|
|
||||||
If you are a new member please use the following link:
|
If you are a new member please use the following link:
|
||||||
{link_new}
|
{link_new}
|
||||||
|
|
||||||
|
@ -133,8 +152,8 @@ fn send_mail(config: &Config, record: &Record, auth: &str) -> Result<Response, l
|
||||||
If you have issues please refer to our Discord server:
|
If you have issues please refer to our Discord server:
|
||||||
{discord}
|
{discord}
|
||||||
|
|
||||||
UL Computer Society
|
|
||||||
Skynet Team
|
Skynet Team
|
||||||
|
UL Computer Society
|
||||||
"#
|
"#
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue