diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-03 15:09:58 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-03 15:09:58 +0000 |
| commit | e9c064e355fee23eca94878748b4b182d1d625ac (patch) | |
| tree | 7b6d2c0f1590858ca3eaed80de5758c64b9ee328 /prosody.cfg.lua.dist | |
| parent | f1a9c23909b5472f68a9d81c858d267c48a9405e (diff) | |
| parent | 1c20002637bbd2c9cfaa951acd74ed95a0217e99 (diff) | |
| download | prosody-e9c064e355fee23eca94878748b4b182d1d625ac.tar.gz prosody-e9c064e355fee23eca94878748b4b182d1d625ac.zip | |
Merge from waqas
Diffstat (limited to 'prosody.cfg.lua.dist')
| -rw-r--r-- | prosody.cfg.lua.dist | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index 52cc7c73..5a0fab71 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -49,7 +49,7 @@ Host "*" "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
@@ -75,4 +75,4 @@ Host "example.com" }
enabled = false -- This will disable the host, preserving the config, but denying connections
-
+>>>>>>> other
|