aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-01-07 04:42:01 +0000
committerMatthew Wild <mwild1@gmail.com>2011-01-07 04:42:01 +0000
commit0318c8644d6c70deeb661c87c4cd8ed918497cdd (patch)
tree19166e73e0df8ab5bf5e87d860ee7602b9a9297f /prosody.cfg.lua.dist
parentc32601b14fb35115a64d977fcf8087bff572635e (diff)
parent74408ff9f5ed48bfd4125729e2bdada3f19356be (diff)
downloadprosody-0318c8644d6c70deeb661c87c4cd8ed918497cdd.tar.gz
prosody-0318c8644d6c70deeb661c87c4cd8ed918497cdd.zip
Merge 0.8->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
-rw-r--r--prosody.cfg.lua.dist20
1 files changed, 19 insertions, 1 deletions
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 3134acb6..41850537 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -66,6 +66,7 @@ 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
@@ -88,10 +89,27 @@ 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 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 = {