diff options
| author | Kim Alvefur <zash@zash.se> | 2022-12-12 07:10:54 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2022-12-12 07:10:54 +0100 |
| commit | 080d7974bf0c1da8a1c0578d67c3172facc9d719 (patch) | |
| tree | 838d6904e47ab8681928b37701ff4f1c6e89184a /net/server.lua | |
| parent | baff85a52c5fda705e8b3699410c770f015d89ab (diff) | |
| parent | c916ce76ee89dca32e7e653dff1ade4732462efc (diff) | |
| download | prosody-080d7974bf0c1da8a1c0578d67c3172facc9d719.tar.gz prosody-080d7974bf0c1da8a1c0578d67c3172facc9d719.zip | |
Merge 0.12->trunk
Diffstat (limited to 'net/server.lua')
| -rw-r--r-- | net/server.lua | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/server.lua b/net/server.lua index 0696fd52..72272bef 100644 --- a/net/server.lua +++ b/net/server.lua @@ -118,6 +118,13 @@ if prosody and set_config then prosody.events.add_handler("config-reloaded", load_config); end +local tls_builder = server.tls_builder; +-- resolving the basedir here avoids util.sslconfig depending on +-- prosody.paths.config +function server.tls_builder() + return tls_builder(prosody.paths.config or "") +end + -- require "net.server" shall now forever return this, -- ie. server_select or server_event as chosen above. return server; |