diff options
author | Kim Alvefur <zash@zash.se> | 2014-03-25 19:18:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-03-25 19:18:32 +0100 |
commit | c98c0fb432db6ce9c7bbcd433168aa27b36854b8 (patch) | |
tree | 652efec3423f31c2562f4eab50e0bd3d48bf884c /prosody.cfg.lua.dist | |
parent | 7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0 (diff) | |
parent | 8c0d996be4f47b77a02668474d3d8a0a41bd0f98 (diff) | |
download | prosody-c98c0fb432db6ce9c7bbcd433168aa27b36854b8.tar.gz prosody-c98c0fb432db6ce9c7bbcd433168aa27b36854b8.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
-rw-r--r-- | prosody.cfg.lua.dist | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index 1d11a658..ade219a8 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -63,7 +63,6 @@ modules_enabled = { --"http_files"; -- Serve static files from a directory over HTTP -- Other specific functionality - --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. --"groups"; -- Shared roster support --"announce"; -- Send announcement to all online users --"welcome"; -- Welcome users who register accounts @@ -78,6 +77,7 @@ modules_disabled = { -- "offline"; -- Store offline messages -- "c2s"; -- Handle client connections -- "s2s"; -- Handle server-to-server connections + -- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. } -- Disable account creation by default, for security |