Merge 0.6->0.7

[prosody.git] / prosody.cfg.lua.dist

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index c43d1131903029f41e59d4dbbef11f1196374353..a17eb8773aaaababdb3cffe49ecb5419f61860f7 100644 (file)
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -22,8 +22,13 @@
 -- Example: admins = { "user1@example.com", "user2@example.net" }
 admins = { }
 
+-- Enable use of libevent for better performance under high load
+-- For more information see: http://prosody.im/doc/libevent
+--use_libevent = true;
+
 -- This is the list of modules Prosody will load on startup.
 -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
+-- Documentation on modules can be found at: http://prosody.im/doc/modules
 modules_enabled = {
 
        -- Generally required
@@ -32,11 +37,13 @@ modules_enabled = {
                "tls"; -- Add support for secure TLS on c2s/s2s connections
                "dialback"; -- s2s dialback support
                "disco"; -- Service discovery
-       
+
        -- Not essential, but recommended
                "private"; -- Private XML storage (for room bookmarks, etc.)
                "vcard"; -- Allow users to set vCards
-       
+               --"privacy"; -- Support privacy lists
+               --"compression"; -- Stream compression
+
        -- Nice to have
                "legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
                "version"; -- Replies to server version requests
@@ -45,12 +52,16 @@ modules_enabled = {
                "ping"; -- Replies to XMPP pings with pongs
                "pep"; -- Enables users to publish their mood, activity, playing music and more
                "register"; -- Allow users to register on this server using a client and change passwords
-       
+
        -- Other specific functionality
                --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
                --"console"; -- Opens admin telnet interface on localhost port 5582
                --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
                --"httpserver"; -- Serve static files from a directory over HTTP
+               --"groups"; -- Shared roster support
+               --"announce"; -- Send announcement to all online users
+               --"welcome"; -- Welcome users who register accounts
+               --"watchregistrations"; -- Alert admins of registrations
 };
 
 -- These modules are auto-loaded, should you
@@ -73,6 +84,15 @@ ssl = {
        certificate = "certs/localhost.cert";
 }
 
+-- Require encryption on client/server connections?
+--c2s_require_encryption = false
+--s2s_require_encryption = false
+
+-- Logging configuration
+-- For advanced logging see http://prosody.im/doc/logging
+log = "prosody.log";
+debug = false; -- Log debug messages?
+
 ----------- Virtual hosts -----------
 -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
 -- Settings under each VirtualHost entry apply *only* to that host.
@@ -89,7 +109,7 @@ VirtualHost "example.com"
        ssl = { 
                key = "certs/example.com.key";
                certificate = "certs/example.com.crt";
-               }
+       }
 
 ------ Components ------
 -- You can specify components to add hosts that provide special services,
@@ -99,6 +119,9 @@ VirtualHost "example.com"
 ---Set up a MUC (multi-user chat) room server on conference.example.com:
 --Component "conference.example.com" "muc"
 
+-- Set up a SOCKS5 bytestream proxy for server-proxied file transfers:
+--Component "proxy.example.com" "proxy65"
+
 ---Set up an external component (default component port is 5347)
 --Component "gateway.example.com"
 --     component_secret = "password"