Comparison

prosody.cfg.lua.dist @ 4088:0e5585910583

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 07 Jan 2011 04:42:01 +0000
parent 4087:e239504d8fff
child 4089:0bcbe6c24a6e
comparison
equal deleted inserted replaced
4082:eeab15f8aa35 4088:0e5585910583
64 --"httpserver"; -- Serve static files from a directory over HTTP 64 --"httpserver"; -- Serve static files from a directory over HTTP
65 --"groups"; -- Shared roster support 65 --"groups"; -- Shared roster support
66 --"announce"; -- Send announcement to all online users 66 --"announce"; -- Send announcement to all online users
67 --"welcome"; -- Welcome users who register accounts 67 --"welcome"; -- Welcome users who register accounts
68 --"watchregistrations"; -- Alert admins of registrations 68 --"watchregistrations"; -- Alert admins of registrations
69 --"motd"; -- Send a message to users when they log in
69 }; 70 };
70 71
71 -- These modules are auto-loaded, should you 72 -- These modules are auto-loaded, should you
72 -- (for some mad reason) want to disable 73 -- (for some mad reason) want to disable
73 -- them then uncomment them below 74 -- them then uncomment them below
86 ssl = { 87 ssl = {
87 key = "certs/localhost.key"; 88 key = "certs/localhost.key";
88 certificate = "certs/localhost.cert"; 89 certificate = "certs/localhost.cert";
89 } 90 }
90 91
91 -- Require encryption on client/server connections? 92 -- Only allow encrypted streams? Encryption is already used when
93 -- available. These options will cause Prosody to deny connections that
94 -- are not encrypted. Note that some servers do not support s2s
95 -- encryption or have it disabled, including gmail.com and Google Apps
96 -- domains.
97
92 --c2s_require_encryption = false 98 --c2s_require_encryption = false
93 --s2s_require_encryption = false 99 --s2s_require_encryption = false
100
101 -- Select the storage backend to use. By default Prosody uses flat files
102 -- in its configured data directory, but it also supports more backends
103 -- through modules. An "sql" backend is included by default, but requires
104 -- additional dependencies. See http://prosody.im/doc/storage for more info.
105
106 --storage = "sql" -- Default is "internal"
107
108 -- For the "sql" backend, you can uncomment *one* of the below to configure:
109 --sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
110 --sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
111 --sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
94 112
95 -- Logging configuration 113 -- Logging configuration
96 -- For advanced logging see http://prosody.im/doc/logging 114 -- For advanced logging see http://prosody.im/doc/logging
97 log = { 115 log = {
98 info = "prosody.log"; -- Change info to debug for verbose logging 116 info = "prosody.log"; -- Change info to debug for verbose logging