s2smanager: Log the hostname and address when s2s connection fails instantly

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

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 1c61e6b3d51438676fc6985e52bf7cd1164fda07..8e12f92221c5614c0f020f0b3dca2efc8faae304 100644 (file)
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -15,7 +15,7 @@
 -- A table is a list of values, except each value has a name. An \r
 -- example 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
@@ -36,22 +36,36 @@ Host "*"
        -- 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
-                               "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.\r
-                               "legacyauth"; -- Legacy authentication. Only used by some old clients and bots.\r
+                       -- Generally required\r
                                "roster"; -- Allow users to have a roster. Recommended ;)\r
-                               "register"; -- Allow users to register on this server using a client\r
+                               "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.\r
                                "tls"; -- Add support for secure TLS on c2s/s2s connections\r
-                               "vcard"; -- Allow users to set vCards\r
-                               "private"; -- Private XML storage (for room bookmarks, etc.)\r
-                               "version"; -- Replies to server version requests\r
                                "dialback"; -- s2s dialback support\r
                                "disco"; -- Service discovery\r
-                               "ping"; -- XMPP Ping\r
-                               "time"; -- Let others know the time here\r
-                               "uptime"; -- Uptime reporting\r
-                               "console"; -- telnet to port 5582 (needs console_enabled = true)\r
+                       \r
+                       -- Not essential, but recommended\r
+                               "private"; -- Private XML storage (for room bookmarks, etc.)\r
+                               "vcard"; -- Allow users to set vCards\r
+                       \r
+                       -- Nice to have\r
+                               "legacyauth"; -- Legacy authentication. Only used by some old clients and bots.\r
+                               "version"; -- Replies to server version requests\r
+                               "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
+                               "register"; -- Allow users to register on this server using a client and change passwords\r
+\r
+                       -- Other specific functionality\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
+       -- 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,3 +89,6 @@ Host "example.com"
                }\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