haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-09 19:29:03 +00:00
Code Issues Releases Wiki Activity

compatible with httpserver (#470)

Browse Source
This commit is contained in:
Xiangyue Cai
2021-06-18 15:23:36 +08:00
committed by GitHub
parent 5cb36566ce
commit 1a81f671e3
1 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
fileserver/fileserver.go
View File

@@ -220,6 +220,25 @@ func loadFileServerOptions() {
initDefaultOptions() initDefaultOptions()
if section, err := config.GetSection("fileserver"); err == nil { if section, err := config.GetSection("fileserver"); err == nil {
parseFileServerSection(section)
} else if section, err := config.GetSection("httpserver"); err == nil {
parseFileServerSection(section)
}
ccnetConfPath := filepath.Join(centralDir, "ccnet.conf")
config, err = ini.Load(ccnetConfPath)
if err != nil {
log.Fatalf("Failed to load ccnet.conf: %v", err)
}
groupTableName = "Group"
if section, err := config.GetSection("GROUP"); err == nil {
if key, err := section.GetKey("TABLE_NAME"); err == nil {
groupTableName = key.String()
}
}
}
func parseFileServerSection(section *ini.Section) {
if key, err := section.GetKey("host"); err == nil { if key, err := section.GetKey("host"); err == nil {
options.host = key.String() options.host = key.String()
} }
@@ -255,19 +274,6 @@ func loadFileServerOptions() {
} }
} }
ccnetConfPath := filepath.Join(centralDir, "ccnet.conf")
config, err = ini.Load(ccnetConfPath)
if err != nil {
log.Fatalf("Failed to load ccnet.conf: %v", err)
}
groupTableName = "Group"
if section, err := config.GetSection("GROUP"); err == nil {
if key, err := section.GetKey("TABLE_NAME"); err == nil {
groupTableName = key.String()
}
}
}
func initDefaultOptions() { func initDefaultOptions() {
options.host = "0.0.0.0" options.host = "0.0.0.0"
options.port = 8082 options.port = 8082