diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-11-29 19:09:38 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-11-29 19:09:38 +0000 |
| commit | c6ff510f18d6a036eb88fa602a8a753f9d0fd47a (patch) | |
| tree | f102f2b3cddf8f00b0a4baed9f0d690783f6a825 /prosody.cfg.lua.dist | |
| parent | 8b4303771ba77b996a1d375f932300029346f7cd (diff) | |
| parent | 10463d1bb73dc74d69f2584beb6316e171cb4dbf (diff) | |
| download | prosody-c6ff510f18d6a036eb88fa602a8a753f9d0fd47a.tar.gz prosody-c6ff510f18d6a036eb88fa602a8a753f9d0fd47a.zip | |
Automated merge with http://waqas.ath.cx/
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. |