Merge 0.10->trunk

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

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 30221da92e23be54076842114f3063f3c8d0caa1..ade219a802200020eae87105a53cb38412df273a 100644 (file)
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -63,7 +63,6 @@ modules_enabled = {
                --"http_files"; -- Serve static files from a directory over HTTP
 
        -- Other specific functionality
-               --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
                --"groups"; -- Shared roster support
                --"announce"; -- Send announcement to all online users
                --"welcome"; -- Welcome users who register accounts
@@ -78,6 +77,7 @@ modules_disabled = {
        -- "offline"; -- Store offline messages
        -- "c2s"; -- Handle client connections
        -- "s2s"; -- Handle server-to-server connections
+       -- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
 }
 
 -- Disable account creation by default, for security
@@ -94,7 +94,7 @@ ssl = {
 -- Force clients to use encrypted connections? This option will
 -- prevent clients from authenticating unless they are using encryption.
 
-c2s_require_encryption = false
+c2s_require_encryption = true
 
 -- Force certificate authentication for server-to-server connections?
 -- This provides ideal security, but requires servers you communicate