mod_presence: Re-probe for contacts presence after outgoing 'subscribed' (fixes ...

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

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index db85a70b3dfb3cf2e28bf5355f27ab47c84f430d..230329325b39eaf702f3114bf4b15fbce6188040 100644 (file)
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -41,6 +41,8 @@ modules_enabled = {
        -- Not essential, but recommended
                "private"; -- Private XML storage (for room bookmarks, etc.)
                "vcard"; -- Allow users to set vCards
+       
+       -- These are commented by default as they have a performance impact
                --"privacy"; -- Support privacy lists
                --"compression"; -- Stream compression
 
@@ -51,16 +53,17 @@ 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
+       
+       -- HTTP modules
+               --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+               --"http_files"; -- Serve static files from a directory over HTTP
 
        -- Other specific functionality
                --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-               --"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
@@ -69,14 +72,12 @@ modules_enabled = {
                --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
 };
 
--- These modules are auto-loaded, should you
--- (for some mad reason) want to disable
--- them then uncomment them below
+-- These modules are auto-loaded, but should you want
+-- to disable them then uncomment them here:
 modules_disabled = {
-       -- "presence"; -- Route user/contact status information
-       -- "message"; -- Route messages
-       -- "iq"; -- Route info queries
        -- "offline"; -- Store offline messages
+       -- "c2s"; -- Handle client connections
+       -- "s2s"; -- Handle server-to-server connections
 };
 
 -- Disable account creation by default, for security
@@ -87,17 +88,32 @@ allow_registration = false;
 -- to use SSL/TLS, you may comment or remove this
 ssl = {
        key = "certs/localhost.key";
-       certificate = "certs/localhost.cert";
+       certificate = "certs/localhost.crt";
 }
 
--- 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.
+-- Force clients to use encrypted connections? This option will
+-- prevent clients from authenticating unless they are using encryption.
+
+c2s_require_encryption = false
+
+-- Force certificate authentication for server-to-server connections?
+-- This provides ideal security, but requires servers you communicate
+-- with to support encryption AND present valid, trusted certificates.
+-- NOTE: Your version of LuaSec must support certificate verification!
+-- For more information see http://prosody.im/doc/s2s#security
+
+s2s_secure_auth = false
+
+-- Many servers don't support encryption or have invalid or self-signed
+-- certificates. You can list domains here that will not be required to
+-- authenticate using certificates. They will be authenticated using DNS.
+
+--s2s_insecure_domains = { "gmail.com" }
+
+-- Even if you leave s2s_secure_auth disabled, you can still require valid
+-- certificates for some domains by specifying a list here.
 
---c2s_require_encryption = false
---s2s_require_encryption = false
+--s2s_secure_domains = { "jabber.org" }
 
 -- Select the authentication backend to use. The 'internal' providers
 -- use Prosody's configured data storage to store the authentication data.