net/server_select.lua: Reduce select() timeout back to 1s

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

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index a17eb8773aaaababdb3cffe49ecb5419f61860f7..e4afce5bffc204da05e38eda9acbacdffa6a29e1 100644 (file)
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -1,8 +1,8 @@
 -- Prosody Example Configuration File
--- 
+--
 -- Information on configuring Prosody can be found on our
 -- website at http://prosody.im/doc/configure
--- 
+--
 -- Tip: You can check that the syntax of this file is correct
 -- when you have finished by running: luac -p prosody.cfg.lua
 -- If there are any errors, it will let you know what and where
@@ -52,10 +52,14 @@ 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
+               "adhoc"; -- Support for "ad-hoc commands" that can be executed with an XMPP client
+
+       -- Admin interfaces
+               "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+               --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
 
        -- 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
@@ -65,7 +69,7 @@ modules_enabled = {
 };
 
 -- These modules are auto-loaded, should you
--- for (for some mad reason) want to disable
+-- (for some mad reason) want to disable
 -- them then uncomment them below
 modules_disabled = {
        -- "presence";
@@ -76,7 +80,7 @@ modules_disabled = {
 -- Disable account creation by default, for security
 -- For more information see http://prosody.im/doc/creating_accounts
 allow_registration = false;
-       
+
 -- These are the SSL/TLS-related settings. If you don't want
 -- to use SSL/TLS, you may comment or remove this
 ssl = {
@@ -106,7 +110,7 @@ VirtualHost "example.com"
        -- set in the global section (if any).
        -- Note that old-style SSL on port 5223 only supports one certificate, and will always
        -- use the global one.
-       ssl = { 
+       ssl = {
                key = "certs/example.com.key";
                certificate = "certs/example.com.crt";
        }