s2smanager: Fix letter case in log message (thanks darkrain)

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

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 3134acb6d29cb2be7928289b5b561282213e6016..e513b11622ae901cbcc6d52e2e055d7441fe5d53 100644 (file)
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -66,15 +66,17 @@ modules_enabled = {
                --"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
 -- 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
@@ -88,16 +90,43 @@ ssl = {
        certificate = "certs/localhost.cert";
 }
 
--- Require encryption on client/server connections?
+-- 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.
+
 --c2s_require_encryption = false
 --s2s_require_encryption = false
 
+-- Select the authentication backend to use. The 'internal' providers
+-- use Prosody's configured data storage to store the authentication data.
+-- To allow Prosody to offer secure authentication mechanisms to clients, the
+-- default provider stores passwords in plaintext. If you do not trust your
+-- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed
+-- for information about using the hashed backend.
+
+authentication = "internal_plain"
+
+-- 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
+       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 -----------