diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-23 01:30:58 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-23 01:30:58 +0100 |
| commit | 761779fef974a25ec1d96f93941cc54bb40ae0af (patch) | |
| tree | 8907b93b95ab3e10a7e3fc7aaef48a769cd190b0 /plugins | |
| parent | 2880ac5ebadc2b3eb7f4b05f80365c4847ee4b1d (diff) | |
| parent | 886603192223eeb71f83997c6958bf120cb1c530 (diff) | |
| download | prosody-761779fef974a25ec1d96f93941cc54bb40ae0af.tar.gz prosody-761779fef974a25ec1d96f93941cc54bb40ae0af.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_http_files.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_posix.lua | 2 | ||||
| -rw-r--r-- | plugins/muc/lock.lib.lua | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index b9a84cd3..e477bafe 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -16,7 +16,7 @@ local stat = lfs.attributes; local build_path = require"socket.url".build_path; local path_sep = package.config:sub(1,1); -local base_path = module:get_option_string("http_files_dir", module:get_option_string("http_path")); +local base_path = module:get_option_path("http_files_dir", module:get_option_path("http_path")); local cache_size = module:get_option_number("http_files_cache_size", 128); local cache_max_file_size = module:get_option_number("http_files_cache_max_file_size", 4096); local dir_indices = module:get_option_array("http_index_files", { "index.html", "index.htm" }); diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua index 122f550a..46151117 100644 --- a/plugins/mod_posix.lua +++ b/plugins/mod_posix.lua @@ -80,7 +80,7 @@ local function write_pidfile() if pidfile_handle then remove_pidfile(); end - pidfile = module:get_option_string("pidfile"); + pidfile = module:get_option_path("pidfile", nil, "data"); if pidfile then local err; local mode = stat(pidfile) and "r+" or "w+"; diff --git a/plugins/muc/lock.lib.lua b/plugins/muc/lock.lib.lua index 15dd624b..928805ec 100644 --- a/plugins/muc/lock.lib.lua +++ b/plugins/muc/lock.lib.lua @@ -42,6 +42,7 @@ end -- Don't let users into room while it is locked module:hook("muc-occupant-pre-join", function(event) if not event.is_new_room and is_locked(event.room) then -- Deny entry + module:log("debug", "Room is locked, denying entry"); event.origin.send(st.error_reply(event.stanza, "cancel", "item-not-found")); return true; end |