From 1c73c20e79725bde638c10b3cbc8f9e11faca63d Mon Sep 17 00:00:00 2001 From: Caesar Schinas Date: Mon, 19 Dec 2022 20:01:46 +0000 Subject: [PATCH] Rebrand default config settings for new installs (#140) Replaces `Gitea` with `Forgejo` in the default config settings for new installs. This will not affect existing installs. Co-authored-by: Caesar Schinas Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/140 Co-authored-by: Caesar Schinas Co-committed-by: Caesar Schinas --- modules/setting/repository.go | 2 +- modules/setting/setting.go | 2 +- web_src/js/features/install.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/setting/repository.go b/modules/setting/repository.go index ea288d2ed..a1b08b7d8 100644 --- a/modules/setting/repository.go +++ b/modules/setting/repository.go @@ -274,7 +274,7 @@ func newRepository() { Repository.UseCompatSSHURI = sec.Key("USE_COMPAT_SSH_URI").MustBool() Repository.MaxCreationLimit = sec.Key("MAX_CREATION_LIMIT").MustInt(-1) Repository.DefaultBranch = sec.Key("DEFAULT_BRANCH").MustString(Repository.DefaultBranch) - RepoRootPath = sec.Key("ROOT").MustString(path.Join(AppDataPath, "gitea-repositories")) + RepoRootPath = sec.Key("ROOT").MustString(path.Join(AppDataPath, "forgejo-repositories")) forcePathSeparator(RepoRootPath) if !filepath.IsAbs(RepoRootPath) { RepoRootPath = filepath.Join(AppWorkPath, RepoRootPath) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 221469eb7..f9c73d0b0 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -663,7 +663,7 @@ func loadFromConf(allowEmpty bool, extraConfig string) { forcePathSeparator(LogRootPath) sec := Cfg.Section("server") - AppName = Cfg.Section("").Key("APP_NAME").MustString("Gitea: Git with a cup of tea") + AppName = Cfg.Section("").Key("APP_NAME").MustString("Forgejo: Beyond coding. We Forge.") Domain = sec.Key("DOMAIN").MustString("localhost") HTTPAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0") diff --git a/web_src/js/features/install.js b/web_src/js/features/install.js index 9468ba9c4..51255fd99 100644 --- a/web_src/js/features/install.js +++ b/web_src/js/features/install.js @@ -5,8 +5,8 @@ export function initInstall() { return; } - const defaultDbUser = 'gitea'; - const defaultDbName = 'gitea'; + const defaultDbUser = 'forgejo'; + const defaultDbName = 'forgejo'; const defaultDbHosts = { mysql: '127.0.0.1:3306',