projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_privacy: Fix repeated presence-in (should be presence-out) - this stops the block...
[prosody.git]
/
prosody.cfg.lua.dist
diff --git
a/prosody.cfg.lua.dist
b/prosody.cfg.lua.dist
index d660a9bd21d80b0219700be4ace0af008292059e..de07d7c52b64e102d1a99317f5d577646b71a298 100644
(file)
--- a/
prosody.cfg.lua.dist
+++ b/
prosody.cfg.lua.dist
@@
-1,38
+1,38
@@
--- Prosody Example Configuration File
+-- Prosody Example Configuration File
--
--
--- If it wasn't already obvious, -- starts a comment, and all
+-- If it wasn't already obvious, -- starts a comment, and all
-- text after it on a line is ignored by Prosody.
--
-- text after it on a line is ignored by Prosody.
--
--- The config is split into sections, a global section, and one
--- for each defined host that we serve. You can add as many host
+-- The config is split into sections, a global section, and one
+-- for each defined host that we serve. You can add as many host
-- sections as you like.
--
-- sections as you like.
--
--- Lists are written { "like", "this", "one" }
--- Lists can also be of { 1, 2, 3 } numbers, and other things.
+-- Lists are written { "like", "this", "one" }
+-- Lists can also be of { 1, 2, 3 } numbers, and other things.
-- Either commas, or semi-colons; may be used
-- as seperators.
--
-- Either commas, or semi-colons; may be used
-- as seperators.
--
--- A table is a list of values, except each value has a name. An
+-- A table is a list of values, except each value has a name. An
-- example table would be:
--
-- ssl = { key = "keyfile.key", certificate = "certificate.cert" }
--
-- example table would be:
--
-- ssl = { key = "keyfile.key", certificate = "certificate.cert" }
--
--- Whitespace (that is tabs, spaces, line breaks) is mostly insignificant, so
--- can
+-- Whitespace (that is tabs, spaces, line breaks) is mostly insignificant, so
+-- can
-- be placed anywhere that you deem fitting.
--
-- Tip: You can check that the syntax of this file is correct when you have finished
-- by running: luac -p prosody.cfg.lua
-- be placed anywhere that you deem fitting.
--
-- Tip: You can check that the syntax of this file is correct when you have finished
-- by running: luac -p prosody.cfg.lua
--- If there are any errors, it will let you know what and where they are, otherwise it
+-- If there are any errors, it will let you know what and where they are, otherwise it
-- will keep quiet.
--
-- will keep quiet.
--
--- The only thing left to do is rename this file to remove the .dist ending, and fill in the
+-- The only thing left to do is rename this file to remove the .dist ending, and fill in the
-- blanks. Good luck, and happy Jabbering!
-- Server-wide settings go in this section
Host "*"
-- blanks. Good luck, and happy Jabbering!
-- Server-wide settings go in this section
Host "*"
- -- This is a (by default, empty) list of accounts that are admins
+ -- 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)
-- Example: admins = { "user1@example.com", "user2@example.net" }
-- for the server. Note that you must create the accounts separately
-- (see http://prosody.im/doc/creating_accounts for info)
-- Example: admins = { "user1@example.com", "user2@example.net" }
@@
-63,7
+63,7
@@
Host "*"
-- Other specific functionality
--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-- Other specific functionality
--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
- --"console"; --
telnet to port 5582 (needs console_enabled = true)
+ --"console"; --
Opens admin telnet interface on localhost port 5582
--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
--"httpserver"; -- Serve static files from a directory over HTTP
};
--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
--"httpserver"; -- Serve static files from a directory over HTTP
};
@@
-83,7
+83,7
@@
Host "*"
-- These are the SSL/TLS-related settings. If you don't want
-- to use SSL/TLS, you may comment or remove this
-- These are the SSL/TLS-related settings. If you don't want
-- to use SSL/TLS, you may comment or remove this
- ssl = {
+ ssl = {
key = "certs/localhost.key";
certificate = "certs/localhost.cert";
}
key = "certs/localhost.key";
certificate = "certs/localhost.cert";
}
@@
-101,7
+101,7
@@
Host "example.com"
-- set in the global section (if any).
-- Note that old-style SSL on port 5223 only supports one certificate, and will always
-- use the global one.
-- set in the global section (if any).
-- Note that old-style SSL on port 5223 only supports one certificate, and will always
-- use the global one.
- ssl = {
+ ssl = {
key = "certs/example.com.key";
certificate = "certs/example.com.crt";
}
key = "certs/example.com.key";
certificate = "certs/example.com.crt";
}