diff options
author | Matthew Wild <mwild1@gmail.com> | 2011-01-07 05:11:17 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2011-01-07 05:11:17 +0000 |
commit | 79bcb5c7cfed2a2ea89d2bac48bacb9e9447d599 (patch) | |
tree | 5223ae6345002c076cce53b7b6dc873228adabe8 | |
parent | 0318c8644d6c70deeb661c87c4cd8ed918497cdd (diff) | |
parent | f12a844d966fd910f024f450eb6332d0a9a7ec26 (diff) | |
download | prosody-79bcb5c7cfed2a2ea89d2bac48bacb9e9447d599.tar.gz prosody-79bcb5c7cfed2a2ea89d2bac48bacb9e9447d599.zip |
Merge 0.8->trunk
-rw-r--r-- | prosody.cfg.lua.dist | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index 41850537..d1bd7d67 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -73,9 +73,10 @@ modules_enabled = { -- (for some mad reason) want to disable -- them then uncomment them below modules_disabled = { - -- "presence"; - -- "message"; - -- "iq"; + -- "presence"; -- Route user/contact status information + -- "message"; -- Route messages + -- "iq"; -- Route info queries + -- "offline"; -- Store offline messages }; -- Disable account creation by default, for security @@ -113,9 +114,10 @@ ssl = { -- Logging configuration -- For advanced logging see http://prosody.im/doc/logging log = { - info = "prosody.log"; -- Change info to debug for verbose logging + info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging error = "prosody.err"; -- "*syslog"; -- Uncomment this for logging to syslog + -- "*console"; -- Log to the console, useful for debugging with daemonize=false } ----------- Virtual hosts ----------- |