Docker/forgejo
Docker/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-02 16:35:19 +02:00
Code Issues Releases Activity

feat: add _URI entries for mail config (#8116)

Browse source 
For the mailer and incoming_mailer config, allow passwords to be read from a file.
Add `_URI` config values and use the existing `loadSecret` function to do this.

Resolves https://codeberg.org/forgejo/forgejo/issues/8113

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8116
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: oliverpool <oliverpool@noreply.codeberg.org>
Co-authored-by: fruzitent <fruzit@gmail.com>
Co-committed-by: fruzitent <fruzit@gmail.com>
This commit is contained in:
fruzitent 2025-07-09 23:15:26 +02:00 • committed by Gusted
parent 24d6972f6b
commit 13b560c191
5 changed files with 54 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/setting/mailer.go
View file

@ -147,6 +147,10 @@ func loadMailerFrom(rootCfg ConfigProvider) {
if sec.HasKey("PASSWORD") && !sec.HasKey("PASSWD") {
sec.Key("PASSWD").SetValue(sec.Key("PASSWORD").String())
}
if sec.HasKey("PASSWORD_URI") && !sec.HasKey("PASSWD_URI") {
sec.Key("PASSWD_URI").SetValue(sec.Key("PASSWORD_URI").String())
}
sec.Key("PASSWD").SetValue(loadSecret(sec, "PASSWD_URI", "PASSWD"))
// Set default values & validate
sec.Key("NAME").MustString(AppName)