forks/forgejo
1
0
Fork 0
Code Releases Activity

[BRANDING] alias {FORGEJO,GITEA}_{CUSTOM,WORK_DIR}

Browse source 
FORGEJO_* environment variables are set to the corresponding GITEA_*
variable when the cli starts. This approach is intended to minimize
the conflicts on rebase. All occurences of GITEA_* are left untouched
in the codebase and they are only changed to FORGEJO_* if exposed to
the user.

(cherry picked from commit e466f9d10e)
(cherry picked from commit e33e95931b)
(cherry picked from commit 2cfc6519b7)
(cherry picked from commit af8864373a)
(cherry picked from commit a0550ff339)
(cherry picked from commit 24dc0a5191)
This commit is contained in:
Loïc Dachary 2023-02-24 13:38:29 +01:00
parent 3ea7dcbd5b
commit e255eea2b4
No known key found for this signature in database
GPG key ID: 992D23B392F9E4F2
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
main.go
View file

@ -50,11 +50,20 @@ func init() {
originalSubcommandHelpTemplate = cli.SubcommandHelpTemplate originalSubcommandHelpTemplate = cli.SubcommandHelpTemplate
} }
func forgejoEnv() {
for _, k := range []string{"CUSTOM", "WORK_DIR"} {
if v, ok := os.LookupEnv("FORGEJO_" + k); ok {
os.Setenv("GITEA_"+k, v)
}
}
}
func main() { func main() {
forgejoEnv()
app := cli.NewApp() app := cli.NewApp()
app.Name = "Gitea" app.Name = "Forgejo"
app.Usage = "A painless self-hosted Git service" app.Usage = "Beyond coding. We forge."
app.Description = `By default, gitea will start serving using the webserver with no app.Description = `By default, forgejo will start serving using the webserver with no
arguments - which can alternatively be run by running the subcommand web.` arguments - which can alternatively be run by running the subcommand web.`
app.Version = Version + formatBuiltWith() app.Version = Version + formatBuiltWith()
app.Commands = []cli.Command{ app.Commands = []cli.Command{
@ -178,6 +187,9 @@ func adjustHelpTemplate(originalTemplate string) string {
if _, ok := os.LookupEnv("GITEA_CUSTOM"); ok { if _, ok := os.LookupEnv("GITEA_CUSTOM"); ok {
overridden = "(GITEA_CUSTOM)" overridden = "(GITEA_CUSTOM)"
} }
if _, ok := os.LookupEnv("FORGEJO_CUSTOM"); ok {
overridden = "(FORGEJO_CUSTOM)"
}
return fmt.Sprintf(`%s return fmt.Sprintf(`%s
DEFAULT CONFIGURATION: DEFAULT CONFIGURATION:

3
modules/setting/setting.go
View file

@ -148,6 +148,9 @@ func SetCustomPathAndConf(providedCustom, providedConf, providedWorkPath string)
if giteaCustom, ok := os.LookupEnv("GITEA_CUSTOM"); ok { if giteaCustom, ok := os.LookupEnv("GITEA_CUSTOM"); ok {
CustomPath = giteaCustom CustomPath = giteaCustom
} }
if forgejoCustom, ok := os.LookupEnv("FORGEJO_CUSTOM"); ok {
CustomPath = forgejoCustom
}
if len(providedCustom) != 0 { if len(providedCustom) != 0 {
CustomPath = providedCustom CustomPath = providedCustom
} }

4
routers/web/admin/config.go
View file

@ -176,10 +176,10 @@ func Config(ctx *context.Context) {
envVars := map[string]*envVar{} envVars := map[string]*envVar{}
if len(os.Getenv("GITEA_WORK_DIR")) > 0 { if len(os.Getenv("GITEA_WORK_DIR")) > 0 {
envVars["GITEA_WORK_DIR"] = &envVar{"GITEA_WORK_DIR", os.Getenv("GITEA_WORK_DIR")} envVars["FORGEJO_WORK_DIR"] = &envVar{"GITEA_WORK_DIR", os.Getenv("GITEA_WORK_DIR")}
} }
if len(os.Getenv("GITEA_CUSTOM")) > 0 { if len(os.Getenv("GITEA_CUSTOM")) > 0 {
envVars["GITEA_CUSTOM"] = &envVar{"GITEA_CUSTOM", os.Getenv("GITEA_CUSTOM")} envVars["FORGEJO_CUSTOM"] = &envVar{"GITEA_CUSTOM", os.Getenv("GITEA_CUSTOM")}
} }
ctx.Data["EnvVars"] = envVars ctx.Data["EnvVars"] = envVars