diff options
| author | Kim Alvefur <zash@zash.se> | 2020-06-01 23:53:03 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-06-01 23:53:03 +0200 |
| commit | 05f5f794bf9afcf412f5f5a9b3935f5fb048ba0d (patch) | |
| tree | 872951e55bb44c9736451b1a36123066b08eb3be | |
| parent | aa24574b89d9a766d7789da3ecb09c600157ff95 (diff) | |
| download | prosody-05f5f794bf9afcf412f5f5a9b3935f5fb048ba0d.tar.gz prosody-05f5f794bf9afcf412f5f5a9b3935f5fb048ba0d.zip | |
util.prosodyctl.shell: Use same config option as module for socket path
So now if you set it to a custom value, both the client and the server
should use it.
| -rw-r--r-- | util/prosodyctl/shell.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/prosodyctl/shell.lua b/util/prosodyctl/shell.lua index 6d5ea116..0e019152 100644 --- a/util/prosodyctl/shell.lua +++ b/util/prosodyctl/shell.lua @@ -6,6 +6,7 @@ if not have_unix or type(unix) ~= "table" then os.exit(1); end +local config = require "core.configmanager"; local server = require "net.server"; local st = require "util.stanza"; local path = require "util.paths"; @@ -113,7 +114,7 @@ local function start(arg) --luacheck: ignore 212/arg end end); - local socket_path = path.join(prosody.paths.data, "prosody.sock"); + local socket_path = path.resolve_relative_path(prosody.paths.data, config.get("*", "admin_socket") or "prosody.sock"); local conn = connection(socket_path, client.listeners); local ok, err = conn:connect(); if not ok then |