浏览代码

allow to start if only httpd service is enabled

Signed-off-by: Nicola Murino <[email protected]>
Nicola Murino 2 年之前
父节点
当前提交
bd118e61bc
共有 2 个文件被更改,包括 7 次插入0 次删除
  1. 3 0
      internal/config/config.go
  2. 4 0
      internal/config/config_test.go

+ 3 - 0
internal/config/config.go

@@ -591,6 +591,9 @@ func HasServicesToStart() bool {
 	if globalConf.WebDAVD.ShouldBind() {
 	if globalConf.WebDAVD.ShouldBind() {
 		return true
 		return true
 	}
 	}
+	if globalConf.HTTPDConfig.ShouldBind() {
+		return true
+	}
 	return false
 	return false
 }
 }
 
 

+ 4 - 0
internal/config/config_test.go

@@ -386,6 +386,10 @@ func TestServiceToStart(t *testing.T) {
 	sftpdConf := config.GetSFTPDConfig()
 	sftpdConf := config.GetSFTPDConfig()
 	sftpdConf.Bindings[0].Port = 0
 	sftpdConf.Bindings[0].Port = 0
 	config.SetSFTPDConfig(sftpdConf)
 	config.SetSFTPDConfig(sftpdConf)
+	// httpd service is enabled
+	assert.True(t, config.HasServicesToStart())
+	httpdConf := config.GetHTTPDConfig()
+	httpdConf.Bindings[0].Port = 0
 	assert.False(t, config.HasServicesToStart())
 	assert.False(t, config.HasServicesToStart())
 	ftpdConf := config.GetFTPDConfig()
 	ftpdConf := config.GetFTPDConfig()
 	ftpdConf.Bindings[0].Port = 2121
 	ftpdConf.Bindings[0].Port = 2121