move auths config

3 files changed, 13 insertions, 10 deletions

diff --git a/xmake/modules/private/service/config.lua b/xmake/modules/private/service/config.lua
index d11a4f1ea..e803a79d9 100644
--- a/xmake/modules/private/service/config.lua
+++ b/xmake/modules/private/service/config.lua
@@ -28,16 +28,18 @@ function _generate_configfile()
     local servicedir = path.join(global.directory(), "service")
     local configs = {
         logfile = path.join(servicedir, "logs.txt"),
+        server = {
+            known_hosts = {
+                "127.0.0.1"
+            },
+            auths = {
+                "root:123456"
+            }
+        },
         remote_build = {
             server = {
                 listen = "0.0.0.0:9691",
                 workdir = path.join(servicedir, "remote_build"),
-                known_hosts = {
-                    "127.0.0.1"
-                },
-                auths = {
-                    "root:123456"
-                }
             },
             client = {
                 connect = "127.0.0.1:9691",
diff --git a/xmake/modules/private/service/remote_build/server.lua b/xmake/modules/private/service/remote_build/server.lua
index c6a80fa42..fe720310b 100644
--- a/xmake/modules/private/service/remote_build/server.lua
+++ b/xmake/modules/private/service/remote_build/server.lua
@@ -41,10 +41,6 @@ function remote_build_server:init(daemon)
     local address = assert(config.get("remote_build.server.listen"), "config(remote_build.server.listen): not found!")
     super.address_set(self, address)
 
-    -- init authorizations
-    local auths = config.get("remote_build.server.auths")
-    super.auths_set(self, auths)
-
     -- init handler
     super.handler_set(self, self._on_handle)
 
diff --git a/xmake/modules/private/service/server.lua b/xmake/modules/private/service/server.lua
index 24e6fb644..a2ec2580d 100644
--- a/xmake/modules/private/service/server.lua
+++ b/xmake/modules/private/service/server.lua
@@ -25,6 +25,7 @@ import("core.base.base64")
 import("core.base.hashset")
 import("core.base.socket")
 import("core.base.scheduler")
+import("private.service.config")
 import("private.service.message")
 import("private.service.stream", {alias = "socket_stream"})
 
@@ -34,6 +35,10 @@ local server = server or object()
 -- init server
 function server:init(daemon)
     self._DAEMON = daemon
+
+    -- init authorizations
+    local auths = config.get("server.auths")
+    self:auths_set(auths)
 end
 
 -- is daemon?