diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-29 02:10:55 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-29 02:10:55 +0100 |
| commit | fe228888c0d51612e8b32adc3f9db91b7c6e8ded (patch) | |
| tree | e78baabff21e9b6fefaeef4a709098ca30b35922 /prosody.cfg.lua.dist | |
| parent | 9d04baca862bcad5b49ac4ab0b9c3432321150d3 (diff) | |
| parent | 1ee9f6e09228b268bf3f5dc985d4ba9026a72666 (diff) | |
| download | prosody-fe228888c0d51612e8b32adc3f9db91b7c6e8ded.tar.gz prosody-fe228888c0d51612e8b32adc3f9db91b7c6e8ded.zip | |
Merge 0.9->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
| -rw-r--r-- | prosody.cfg.lua.dist | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index db85a70b..c0c729a9 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -56,11 +56,13 @@ modules_enabled = { -- Admin interfaces "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands --"admin_telnet"; -- Opens telnet console interface on localhost port 5582 + + -- HTTP modules + --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" + --"http_files"; -- Serve static files from a directory over HTTP -- Other specific functionality --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. - --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" - --"httpserver"; -- Serve static files from a directory over HTTP --"groups"; -- Shared roster support --"announce"; -- Send announcement to all online users --"welcome"; -- Welcome users who register accounts |