mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-22 17:34:03 +03:00
Move custom dir to custom/
This commit is contained in:
parent
a9a5fb45f8
commit
8dd956f88a
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,4 +4,4 @@ gogs
|
||||
.DS_Store
|
||||
*.db
|
||||
*.log
|
||||
conf/custom.ini
|
||||
custom/
|
@ -37,15 +37,14 @@ func init() {
|
||||
os.Exit(2)
|
||||
}
|
||||
|
||||
cfgPathPrefix := filepath.Join(workDir, "conf")
|
||||
cfgPath := filepath.Join(cfgPathPrefix, "app.ini")
|
||||
cfgPath := filepath.Join(workDir, "conf/app.ini")
|
||||
Cfg, err = goconfig.LoadConfigFile(cfgPath)
|
||||
if err != nil {
|
||||
fmt.Printf("Cannot load config file '%s'\n", cfgPath)
|
||||
os.Exit(2)
|
||||
}
|
||||
|
||||
cfgPath = filepath.Join(cfgPathPrefix, "custom.ini")
|
||||
cfgPath = filepath.Join(workDir, "custom/conf/app.ini")
|
||||
if com.IsFile(cfgPath) {
|
||||
if err = Cfg.AppendFiles(cfgPath); err != nil {
|
||||
fmt.Printf("Cannot load config file '%s'\n", cfgPath)
|
||||
|
2
serve.go
2
serve.go
@ -58,7 +58,7 @@ func runServ(*cli.Context) {
|
||||
|
||||
cmd := os.Getenv("SSH_ORIGINAL_COMMAND")
|
||||
if cmd == "" {
|
||||
printf("Hi %s! You've successfully authenticated, but Gogs does not provide shell access.\n", user.Name)
|
||||
fmt.Printf("Hi %s! You've successfully authenticated, but Gogs does not provide shell access.\n", user.Name)
|
||||
return
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user