diff options
| author | Tobias Markmann <tm@ayena.de> | 2008-11-29 20:33:14 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2008-11-29 20:33:14 +0100 |
| commit | f4b87362d1de049c4ad1b7d22bb91f3dc0a94c43 (patch) | |
| tree | dfa6d7e6f11ffd124bd8f4393684b24e39e22c30 /prosody.cfg.lua.dist | |
| parent | f39b9177c92385836bf216a459b159784a98ce23 (diff) | |
| parent | 354c65daa0bc974297c0dcaac769dd63725ba4e1 (diff) | |
| download | prosody-f4b87362d1de049c4ad1b7d22bb91f3dc0a94c43.tar.gz prosody-f4b87362d1de049c4ad1b7d22bb91f3dc0a94c43.zip | |
Automated merge.
Diffstat (limited to 'prosody.cfg.lua.dist')
| -rw-r--r-- | prosody.cfg.lua.dist | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index 7b9fe4dd..81d747c0 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -45,13 +45,18 @@ Host "*" "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) }; -- 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/server.key"; - certificate = "certs/server.crt"; + key = "certs/localhost.key"; + certificate = "certs/localhost.cert"; } -- This allows clients to connect to localhost. No harm in it. |