Merge 0.6->0.7

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

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index d1bd7d67ae91027b104b05237a2607dda85ff8c8..a17eb8773aaaababdb3cffe49ecb5419f61860f7 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,37 +52,31 @@ 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
                --"announce"; -- Send announcement to all online users
                --"welcome"; -- Welcome users who register accounts
                --"watchregistrations"; -- Alert admins of registrations
-               --"motd"; -- Send a message to users when they log in
 };
 
 -- These modules are auto-loaded, should you
--- (for some mad reason) want to disable
+-- for (for some mad reason) want to disable
 -- them then uncomment them below
 modules_disabled = {
-       -- "presence"; -- Route user/contact status information
-       -- "message"; -- Route messages
-       -- "iq"; -- Route info queries
-       -- "offline"; -- Store offline messages
+       -- "presence";
+       -- "message";
+       -- "iq";
 };
 
 -- 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 = {
@@ -90,35 +84,14 @@ ssl = {
        certificate = "certs/localhost.cert";
 }
 
--- Only allow encrypted streams? Encryption is already used when
--- available. These options will cause Prosody to deny connections that
--- are not encrypted. Note that some servers do not support s2s
--- encryption or have it disabled, including gmail.com and Google Apps
--- domains.
-
+-- Require encryption on client/server connections?
 --c2s_require_encryption = false
 --s2s_require_encryption = false
 
--- Select the storage backend to use. By default Prosody uses flat files
--- in its configured data directory, but it also supports more backends
--- through modules. An "sql" backend is included by default, but requires
--- additional dependencies. See http://prosody.im/doc/storage for more info.
-
---storage = "sql" -- Default is "internal"
-
--- For the "sql" backend, you can uncomment *one* of the below to configure:
---sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
---sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
---sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
-
 -- Logging configuration
 -- For advanced logging see http://prosody.im/doc/logging
-log = {
-       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
-}
+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.
@@ -133,7 +106,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";
        }
@@ -150,10 +123,5 @@ VirtualHost "example.com"
 --Component "proxy.example.com" "proxy65"
 
 ---Set up an external component (default component port is 5347)
---
--- External components allow adding various services, such as gateways/
--- transports to other networks like ICQ, MSN and Yahoo. For more info
--- see: http://prosody.im/doc/components#adding_an_external_component
---
 --Component "gateway.example.com"
 --     component_secret = "password"