hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-12-23 01:20:11 +00:00
Code Issues Projects Releases Wiki Activity

Actually use correct variable, actually use variable correctly and added a loadConfig entry

Browse Source
This commit is contained in:
Stefan Schokker 2021-11-09 21:18:54 +01:00
parent 556c31d4ea
commit b7236319ec
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.go
View File

@ -72,6 +72,7 @@ func (app *appContext) loadConfig() error {
app.MustSetValue("deletion", "email_text", "jfa-go:"+"deleted.txt") app.MustSetValue("deletion", "email_text", "jfa-go:"+"deleted.txt")
app.MustSetValue("smtp", "hello_hostname", "localhost") app.MustSetValue("smtp", "hello_hostname", "localhost")
app.MustSetValue("smtp", "cert_validation", "true")
jfUrl := app.config.Section("jellyfin").Key("server").String() jfUrl := app.config.Section("jellyfin").Key("server").String()
if !(strings.HasPrefix(jfUrl, "http://") || strings.HasPrefix(jfUrl, "https://")) { if !(strings.HasPrefix(jfUrl, "http://") || strings.HasPrefix(jfUrl, "https://")) {

6
email.go
View File

@ -84,7 +84,7 @@ func NewEmailer(app *appContext) *Emailer {
if username == "" && password != "" { if username == "" && password != "" {
username = emailer.fromAddr username = emailer.fromAddr
} }
err := emailer.NewSMTP(app.config.Section("smtp").Key("server").String(), app.config.Section("smtp").Key("port").MustInt(465), username, password, sslTLS, app.config.Section("smtp").Key("ssl_cert").MustString(""), app.config.Section("smtp").Key("hello_hostname").String(), app.config.Section("smtp").Key("cert-validation").MustBool(true)) err := emailer.NewSMTP(app.config.Section("smtp").Key("server").String(), app.config.Section("smtp").Key("port").MustInt(465), username, password, sslTLS, app.config.Section("smtp").Key("ssl_cert").MustString(""), app.config.Section("smtp").Key("hello_hostname").String(), app.config.Section("smtp").Key("cert_validation").MustBool(true))
if err != nil { if err != nil {
app.err.Printf("Error while initiating SMTP mailer: %v", err) app.err.Printf("Error while initiating SMTP mailer: %v", err)
} }
@ -131,7 +131,7 @@ func (emailer *Emailer) NewSMTP(server string, port int, username, password stri
// x509.SystemCertPool is unavailable on windows // x509.SystemCertPool is unavailable on windows
if PLATFORM == "windows" { if PLATFORM == "windows" {
sender.Client.TLSConfig = &tls.Config{ sender.Client.TLSConfig = &tls.Config{
InsecureSkipVerify: validateCertificate, InsecureSkipVerify: !validateCertificate,
ServerName: server, ServerName: server,
} }
emailer.sender = sender emailer.sender = sender
@ -149,7 +149,7 @@ func (emailer *Emailer) NewSMTP(server string, port int, username, password stri
} }
} }
sender.Client.TLSConfig = &tls.Config{ sender.Client.TLSConfig = &tls.Config{
InsecureSkipVerify: validateCertificate, InsecureSkipVerify: !validateCertificate,
ServerName: server, ServerName: server,
RootCAs: rootCAs, RootCAs: rootCAs,
} }

3
ts/setup.ts
View File

@ -296,8 +296,7 @@ const settings = {
"encryption": new Select(get("smtp-encryption")), "encryption": new Select(get("smtp-encryption")),
"server": new Input(get("smtp-server")), "server": new Input(get("smtp-server")),
"port": new Input(get("smtp-port")), "port": new Input(get("smtp-port")),
"password": new Input(get("smtp-password")), "password": new Input(get("smtp-password"))
"cert-validation": new Input(get("smtp-cert-validation"))
}, },
"ombi": { "ombi": {
"enabled": new Checkbox(get("ombi-enabled"), "", false, "ombi", "enabled"), "enabled": new Checkbox(get("ombi-enabled"), "", false, "ombi", "enabled"),