mirror of
https://github.com/go-gitea/gitea.git
synced 2026-08-21 01:40:32 +00:00
backport #38974
This commit is contained in:
@@ -312,8 +312,10 @@ func SubmitInstall(ctx *context.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save settings.
|
// Some logic also depends on the config values, so EnvironmentToConfig should also be applied first.
|
||||||
|
// EnvironmentToConfig is applied on each start up, so it also must override the "install form", so it must be applied after (twice).
|
||||||
cfg, err := setting.NewConfigProviderFromFile(setting.CustomConf)
|
cfg, err := setting.NewConfigProviderFromFile(setting.CustomConf)
|
||||||
|
setting.EnvironmentToConfig(cfg, os.Environ())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Failed to load custom conf '%s': %v", setting.CustomConf, err)
|
log.Error("Failed to load custom conf '%s': %v", setting.CustomConf, err)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user