Merge 0.10->trunk

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

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 1d11a658ae951b4eb6249d9e34d728d215a2101d..15725a35a77ad1d69ca9ca227d165e76390d3cf7 100644 (file)
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -1,7 +1,7 @@
 -- Prosody Example Configuration File
 --
 -- Information on configuring Prosody can be found on our
--- website at http://prosody.im/doc/configure
+-- website at https://prosody.im/doc/configure
 --
 -- Tip: You can check that the syntax of this file is correct
 -- when you have finished by running: prosodyctl check config
@@ -18,17 +18,17 @@
 
 -- This is a (by default, empty) list of accounts that are admins
 -- for the server. Note that you must create the accounts separately
--- (see http://prosody.im/doc/creating_accounts for info)
+-- (see https://prosody.im/doc/creating_accounts for info)
 -- Example: admins = { "user1@example.com", "user2@example.net" }
 admins = { }
 
 -- Enable use of libevent for better performance under high load
--- For more information see: http://prosody.im/doc/libevent
+-- For more information see: https://prosody.im/doc/libevent
 --use_libevent = true
 
 -- This is the list of modules Prosody will load on startup.
 -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
--- Documentation on modules can be found at: http://prosody.im/doc/modules
+-- Documentation on modules can be found at: https://prosody.im/doc/modules
 modules_enabled = {
 
        -- Generally required
@@ -43,7 +43,7 @@ modules_enabled = {
                "vcard"; -- Allow users to set vCards
        
        -- These are commented by default as they have a performance impact
-               --"privacy"; -- Support privacy lists
+               --"blocklist"; -- Allow users to block communications with other users
                --"compression"; -- Stream compression
 
        -- Nice to have
@@ -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,10 +77,11 @@ 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
--- For more information see http://prosody.im/doc/creating_accounts
+-- For more information see https://prosody.im/doc/creating_accounts
 allow_registration = false
 
 -- These are the SSL/TLS-related settings. If you don't want
@@ -100,7 +100,7 @@ c2s_require_encryption = true
 -- 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
+-- For more information see https://prosody.im/doc/s2s#security
 
 s2s_secure_auth = false
 
@@ -119,7 +119,7 @@ s2s_secure_auth = false
 -- 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
+-- server please see https://prosody.im/doc/modules/mod_auth_internal_hashed
 -- for information about using the hashed backend.
 
 authentication = "internal_plain"
@@ -127,7 +127,7 @@ 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.
+-- additional dependencies. See https://prosody.im/doc/storage for more info.
 
 --storage = "sql" -- Default is "internal"
 
@@ -137,7 +137,7 @@ authentication = "internal_plain"
 --sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
 
 -- Logging configuration
--- For advanced logging see http://prosody.im/doc/logging
+-- For advanced logging see https://prosody.im/doc/logging
 log = {
        info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
        error = "prosody.err";
@@ -166,7 +166,7 @@ VirtualHost "example.com"
 ------ Components ------
 -- You can specify components to add hosts that provide special services,
 -- like multi-user conferences, and transports.
--- For more information on components, see http://prosody.im/doc/components
+-- For more information on components, see https://prosody.im/doc/components
 
 ---Set up a MUC (multi-user chat) room server on conference.example.com:
 --Component "conference.example.com" "muc"
@@ -178,7 +178,7 @@ VirtualHost "example.com"
 --
 -- 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
+-- see: https://prosody.im/doc/components#adding_an_external_component
 --
 --Component "gateway.example.com"
 --     component_secret = "password"