Minor changes; outgoing TLS works.

[prosody.git] / prosody.cfg.lua.dist

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index dc636192a9daa85ac64957d525bdcb900cf3cc46..de460956b7cfe43cef5b47cf9d1b98f3215d8a38 100644 (file)
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -8,19 +8,18 @@
 -- sections as you like.\r
 --\r
 -- Lists are written { "like", "this", "one" } \r
--- Lists can also be of { 1, 2, 3 } numbers, etc. \r
+-- Lists can also be of { 1, 2, 3 } numbers, and other things. \r
 -- Either commas, or semi-colons; may be used\r
 -- as seperators.\r
 --\r
 -- A table is a list of values, except each value has a name. An \r
--- example would be:\r
+-- example table would be:\r
 --\r
--- logging = { type = "html", directory = "/var/logs", rotate = "daily" }\r
+-- ssl = { key = "keyfile.key", certificate = "certificate.cert" }\r
 --\r
 -- Whitespace (that is tabs, spaces, line breaks) is mostly insignificant, so \r
 -- can \r
--- be placed anywhere\r
--- that        you deem fitting.\r
+-- be placed anywhere that     you deem fitting.\r
 --\r
 -- Tip: You can check that the syntax of this file is correct when you have finished\r
 -- by running: luac -p prosody.cfg.lua\r
@@ -30,9 +29,15 @@
 -- The only thing left to do is rename this file to remove the .dist ending, and fill in the \r
 -- blanks. Good luck, and happy Jabbering!\r
 \r
--- Global settings go in this section\r
+-- Server-wide settings go in this section\r
 Host "*"\r
        \r
+       -- This is a (by default, empty) list of accounts that are admins \r
+       -- for the server. Note that you must create the accounts separately\r
+       -- (see http://prosody.im/doc/creating_accounts for info)\r
+       -- Example: admins = { "user1@example.com", "user2@example.net" }\r
+       admins = { }\r
+       \r
        -- This is the list of modules Prosody will load on startup.\r
        -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.\r
        modules_enabled = {\r
@@ -53,15 +58,29 @@ Host "*"
                                "uptime"; -- Report how long server has been running\r
                                "time"; -- Let others know the time here on this server\r
                                "ping"; -- Replies to XMPP pings with pongs\r
+                               "pep"; -- Enables users to publish their mood, activity, playing music and more\r
+                               "register"; -- Allow users to register on this server using a client and change passwords\r
 \r
                        -- Other specific functionality\r
-                               --"register"; -- Allow users to register on this server using a client\r
                                --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.\r
                                --"console"; -- telnet to port 5582 (needs console_enabled = true)\r
                                --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"\r
                                --"httpserver"; -- Serve static files from a directory over HTTP\r
                          };\r
        \r
+       -- These modules are auto-loaded, should you\r
+       -- for (for some mad reason) want to disable\r
+       -- them then uncomment them below\r
+       modules_disabled = {\r
+                       -- "presence";\r
+                       -- "message";\r
+                       -- "iq";\r
+       };\r
+\r
+       -- Disable account creation by default, for security\r
+       -- For more information see http://prosody.im/doc/creating_accounts\r
+       allow_registration = false;\r
+       \r
        -- These are the SSL/TLS-related settings. If you don't want\r
        -- to use SSL/TLS, you may comment or remove this\r
        ssl = { \r
@@ -75,6 +94,9 @@ Host "localhost"
 -- Section for example.com\r
 -- (replace example.com with your domain name)\r
 Host "example.com"\r
+\r
+       enabled = false -- This will disable the host, preserving the config, but denying connections\r
+\r
        -- Assign this host a certificate for TLS, otherwise it would use the one\r
        -- set in the global section (if any).\r
        -- Note that old-style SSL on port 5223 only supports one certificate, and will always\r
@@ -84,7 +106,5 @@ Host "example.com"
                certificate = "certs/example.com.crt";\r
                }\r
 \r
-       enabled = false -- This will disable the host, preserving the config, but denying connections\r
-\r
 -- Set up a MUC (multi-user chat) room server on conference.example.com:\r
 Component "conference.example.com" "muc"\r