From 63e8a974377169b294a43888ab0e076449c8facb Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 7 Jan 2011 03:47:15 +0000 Subject: prosody.cfg.lua.dist: Add motd plugin --- prosody.cfg.lua.dist | 1 + 1 file changed, 1 insertion(+) (limited to 'prosody.cfg.lua.dist') diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index 3134acb6..75c473a3 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 -- cgit v1.2.3 From 0b78691f9e8ee178e2d68cc16c0c7db9c0b80d81 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 7 Jan 2011 04:32:27 +0000 Subject: prosody.cfg.lua.dist: Add note about the require_encryption options --- prosody.cfg.lua.dist | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'prosody.cfg.lua.dist') diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index 75c473a3..ad533104 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -89,7 +89,12 @@ 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 -- cgit v1.2.3 From 74408ff9f5ed48bfd4125729e2bdada3f19356be Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 7 Jan 2011 04:41:34 +0000 Subject: prosody.cfg.lua.dist: Update to include storage configuration and examples for SQL --- prosody.cfg.lua.dist | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'prosody.cfg.lua.dist') diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index ad533104..41850537 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -98,6 +98,18 @@ ssl = { --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 = { -- cgit v1.2.3