From: Matthew Wild Date: Wed, 3 Dec 2008 15:09:58 +0000 (+0000) Subject: Merge from waqas X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=10904eb0553bd5e6efadbd8ab04ed77c49aa03b9;p=prosody.git Merge from waqas --- 10904eb0553bd5e6efadbd8ab04ed77c49aa03b9 diff --cc prosody.cfg.lua.dist index 52cc7c73,80f9e585..5a0fab71 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@@ -1,78 -1,78 +1,78 @@@ --- Prosody Example Configuration File --- --- If it wasn't already obvious, -- starts a comment, and all --- text after it 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 --- sections as you like. --- --- Lists are written { "like", "this", "one" } --- Lists can also be of { 1, 2, 3 } numbers, etc. --- Either commas, or semi-colons; may be used --- as seperators. --- --- A table is a list of values, except each value has a name. An --- example would be: --- --- logging = { type = "html", directory = "/var/logs", rotate = "daily" } --- --- Whitespace (that is tabs, spaces, line breaks) is insignificant, so can --- be placed anywhere --- that you deem fitting. Youcouldalsoremoveitentirely,butforobviousrea ---sonsIdon'trecommendit. --- --- 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 --- will keep quiet. --- --- 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! - --- Global settings go in this section -Host "*" - - -- 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. - modules_enabled = { - "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in. - "legacyauth"; -- Legacy authentication. Only used by some old clients and bots. - "roster"; -- Allow users to have a roster. Recommended ;) - "register"; -- Allow users to register on this server using a client - "tls"; -- Add support for secure TLS on c2s/s2s connections - "vcard"; -- Allow users to set vCards - "private"; -- Private XML storage (for room bookmarks, etc.) - "version"; -- Replies to server version requests - "dialback"; -- s2s dialback support - "disco"; -- Service discovery - "ping"; -- XMPP Ping - "time"; -- Let others know the time here - "uptime"; -- Uptime reporting - "console"; -- telnet to port 5582 (needs console_enabled = true) - }; - - -- These are the SSL/TLS-related settings. If you don't want - -- to use SSL/TLS, you may comment or remove this - ssl = { - key = "certs/localhost.key"; - certificate = "certs/localhost.cert"; - } - --- This allows clients to connect to localhost. No harm in it. -Host "localhost" - --- Section for example.com --- (replace example.com with your domain name) -Host "example.com" - -- Assign this host a certificate for TLS, otherwise it would use the 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 = { - key = "certs/example.com.key"; - certificate = "certs/example.com.crt"; - } - - enabled = false -- This will disable the host, preserving the config, but denying connections - +-- Prosody Example Configuration File +-- +-- If it wasn't already obvious, -- starts a comment, and all +-- text after it 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 +-- sections as you like. +-- +-- Lists are written { "like", "this", "one" } +-- Lists can also be of { 1, 2, 3 } numbers, etc. +-- Either commas, or semi-colons; may be used +-- as seperators. +-- +-- A table is a list of values, except each value has a name. An +-- example would be: +-- +-- logging = { type = "html", directory = "/var/logs", rotate = "daily" } +-- +-- Whitespace (that is tabs, spaces, line breaks) is insignificant, so can +-- be placed anywhere +-- that you deem fitting. Youcouldalsoremoveitentirely,butforobviousrea +--sonsIdon'trecommendit. +-- +-- 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 +-- will keep quiet. +-- +-- 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! + +-- Global settings go in this section +Host "*" + + -- 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. + modules_enabled = { + "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in. + "legacyauth"; -- Legacy authentication. Only used by some old clients and bots. + "roster"; -- Allow users to have a roster. Recommended ;) + "register"; -- Allow users to register on this server using a client + "tls"; -- Add support for secure TLS on c2s/s2s connections + "vcard"; -- Allow users to set vCards + "private"; -- Private XML storage (for room bookmarks, etc.) + "version"; -- Replies to server version requests + "dialback"; -- s2s dialback support + "disco"; -- Service discovery + "ping"; -- XMPP Ping + "time"; -- Let others know the time here + "uptime"; -- Uptime reporting - "console"; -- telnet to port 5528 (needs console_enabled = true) ++ "console"; -- telnet to port 5582 (needs console_enabled = true) + }; + + -- These are the SSL/TLS-related settings. If you don't want + -- to use SSL/TLS, you may comment or remove this + ssl = { + key = "certs/localhost.key"; + certificate = "certs/localhost.cert"; + } + +-- This allows clients to connect to localhost. No harm in it. +Host "localhost" + +-- Section for example.com +-- (replace example.com with your domain name) +Host "example.com" + -- Assign this host a certificate for TLS, otherwise it would use the 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 = { + key = "certs/example.com.key"; + certificate = "certs/example.com.crt"; + } + + enabled = false -- This will disable the host, preserving the config, but denying connections - ++>>>>>>> other