Make mail identity configurable

The identity field parameter passed to smtp.SendMail is now
configurable instead of being hardcoded to 'Mail Config'.

This fixes issue #900
This commit is contained in:
Phillip Gomez 2016-11-06 14:16:59 -08:00
parent bd2517f002
commit 0dfce1d837
4 changed files with 5 additions and 1 deletions

View File

@ -9,6 +9,7 @@ names = en-US|zh-CN
httpport = 80
[mail]
identity = $email_identity
host = $email_server
port = $email_server_port
username = $email_username

View File

@ -9,6 +9,7 @@ hostname = reg.mydomain.com
ui_url_protocol = http
#Email account settings for sending out password resetting emails.
email_identity = Mail Config
email_server = smtp.mydomain.com
email_server_port = 25
email_username = sample_admin@mydomain.com

View File

@ -73,6 +73,7 @@ validate(rcp)
hostname = rcp.get("configuration", "hostname")
protocol = rcp.get("configuration", "ui_url_protocol")
ui_url = protocol + "://" + hostname
email_identity = rcp.get("configuration", "email_identity")
email_server = rcp.get("configuration", "email_server")
email_server_port = rcp.get("configuration", "email_server_port")
email_username = rcp.get("configuration", "email_username")
@ -191,6 +192,7 @@ render(os.path.join(templates_dir, "ui", "env"),
render(os.path.join(templates_dir, "ui", "app.conf"),
ui_conf,
email_identity=email_identity,
email_server=email_server,
email_server_port=email_server_port,
email_username=email_username,

View File

@ -134,7 +134,7 @@ func loadConfig() {
useTLS = true
}
mc = MailConfig{
Identity: "Mail Config",
Identity: config["identity"],
Host: config["host"],
Port: config["port"],
Username: config["username"],