This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/answer.git
The following commit(s) were added to refs/heads/dev by this push:
new 4040450c fix: add ExternalContentDisplay field to Env
4040450c is described below
commit 4040450c79a419bf5d1a0da55e7d0978273e8a00
Author: hgaol <[email protected]>
AuthorDate: Wed Apr 2 22:21:21 2025 +0800
fix: add ExternalContentDisplay field to Env
---
internal/install/install_from_env.go | 61 +++++++++++++++++++-----------------
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/internal/install/install_from_env.go
b/internal/install/install_from_env.go
index c9e3374b..a6b668ba 100644
--- a/internal/install/install_from_env.go
+++ b/internal/install/install_from_env.go
@@ -41,13 +41,14 @@ type Env struct {
DbFile string `json:"db_file"`
Language string `json:"lang"`
- SiteName string `json:"site_name"`
- SiteURL string `json:"site_url"`
- ContactEmail string `json:"contact_email"`
- AdminName string `json:"name"`
- AdminPassword string `json:"password"`
- AdminEmail string `json:"email"`
- LoginRequired bool `json:"login_required"`
+ SiteName string `json:"site_name"`
+ SiteURL string `json:"site_url"`
+ ContactEmail string `json:"contact_email"`
+ AdminName string `json:"name"`
+ AdminPassword string `json:"password"`
+ AdminEmail string `json:"email"`
+ LoginRequired bool `json:"login_required"`
+ ExternalContentDisplay string `json:"external_content_display"`
}
func TryToInstallByEnv() (installByEnv bool, err error) {
@@ -61,20 +62,21 @@ func TryToInstallByEnv() (installByEnv bool, err error) {
func loadEnv() (env *Env) {
return &Env{
- AutoInstall: os.Getenv("AUTO_INSTALL"),
- DbType: os.Getenv("DB_TYPE"),
- DbUsername: os.Getenv("DB_USERNAME"),
- DbPassword: os.Getenv("DB_PASSWORD"),
- DbHost: os.Getenv("DB_HOST"),
- DbName: os.Getenv("DB_NAME"),
- DbFile: os.Getenv("DB_FILE"),
- Language: os.Getenv("LANGUAGE"),
- SiteName: os.Getenv("SITE_NAME"),
- SiteURL: os.Getenv("SITE_URL"),
- ContactEmail: os.Getenv("CONTACT_EMAIL"),
- AdminName: os.Getenv("ADMIN_NAME"),
- AdminPassword: os.Getenv("ADMIN_PASSWORD"),
- AdminEmail: os.Getenv("ADMIN_EMAIL"),
+ AutoInstall: os.Getenv("AUTO_INSTALL"),
+ DbType: os.Getenv("DB_TYPE"),
+ DbUsername: os.Getenv("DB_USERNAME"),
+ DbPassword: os.Getenv("DB_PASSWORD"),
+ DbHost: os.Getenv("DB_HOST"),
+ DbName: os.Getenv("DB_NAME"),
+ DbFile: os.Getenv("DB_FILE"),
+ Language: os.Getenv("LANGUAGE"),
+ SiteName: os.Getenv("SITE_NAME"),
+ SiteURL: os.Getenv("SITE_URL"),
+ ContactEmail: os.Getenv("CONTACT_EMAIL"),
+ AdminName: os.Getenv("ADMIN_NAME"),
+ AdminPassword: os.Getenv("ADMIN_PASSWORD"),
+ AdminEmail: os.Getenv("ADMIN_EMAIL"),
+ ExternalContentDisplay: os.Getenv("EXTERNAL_CONTENT_DISPLAY"),
}
}
@@ -118,14 +120,15 @@ func initConfigAndDb(env *Env) (err error) {
func initBaseInfo(env *Env) (err error) {
req := &InitBaseInfoReq{
- Language: env.Language,
- SiteName: env.SiteName,
- SiteURL: env.SiteURL,
- ContactEmail: env.ContactEmail,
- AdminName: env.AdminName,
- AdminPassword: env.AdminPassword,
- AdminEmail: env.AdminEmail,
- LoginRequired: env.LoginRequired,
+ Language: env.Language,
+ SiteName: env.SiteName,
+ SiteURL: env.SiteURL,
+ ContactEmail: env.ContactEmail,
+ AdminName: env.AdminName,
+ AdminPassword: env.AdminPassword,
+ AdminEmail: env.AdminEmail,
+ LoginRequired: env.LoginRequired,
+ ExternalContentDisplay: env.ExternalContentDisplay,
}
return requestAPI(req, "POST", "/installation/base-info", InitBaseInfo)
}
