mirror of
https://github.com/go-gitea/gitea.git
synced 2024-09-05 23:34:19 -04: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
|
.DS_Store
|
||||||
*.db
|
*.db
|
||||||
*.log
|
*.log
|
||||||
conf/custom.ini
|
custom/
|
@ -37,15 +37,14 @@ func init() {
|
|||||||
os.Exit(2)
|
os.Exit(2)
|
||||||
}
|
}
|
||||||
|
|
||||||
cfgPathPrefix := filepath.Join(workDir, "conf")
|
cfgPath := filepath.Join(workDir, "conf/app.ini")
|
||||||
cfgPath := filepath.Join(cfgPathPrefix, "app.ini")
|
|
||||||
Cfg, err = goconfig.LoadConfigFile(cfgPath)
|
Cfg, err = goconfig.LoadConfigFile(cfgPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("Cannot load config file '%s'\n", cfgPath)
|
fmt.Printf("Cannot load config file '%s'\n", cfgPath)
|
||||||
os.Exit(2)
|
os.Exit(2)
|
||||||
}
|
}
|
||||||
|
|
||||||
cfgPath = filepath.Join(cfgPathPrefix, "custom.ini")
|
cfgPath = filepath.Join(workDir, "custom/conf/app.ini")
|
||||||
if com.IsFile(cfgPath) {
|
if com.IsFile(cfgPath) {
|
||||||
if err = Cfg.AppendFiles(cfgPath); err != nil {
|
if err = Cfg.AppendFiles(cfgPath); err != nil {
|
||||||
fmt.Printf("Cannot load config file '%s'\n", cfgPath)
|
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")
|
cmd := os.Getenv("SSH_ORIGINAL_COMMAND")
|
||||||
if cmd == "" {
|
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
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user