Comparison

prosody.cfg.lua.dist @ 4797:e239668aa6d2

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 29 Apr 2012 02:10:55 +0100
parent 4775:ab73a32a655e
child 5293:fe9215155453
comparison
equal deleted inserted replaced
4796:04a34287dc12 4797:e239668aa6d2
54 "adhoc"; -- Support for "ad-hoc commands" that can be executed with an XMPP client 54 "adhoc"; -- Support for "ad-hoc commands" that can be executed with an XMPP client
55 55
56 -- Admin interfaces 56 -- Admin interfaces
57 "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands 57 "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
58 --"admin_telnet"; -- Opens telnet console interface on localhost port 5582 58 --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
59
60 -- HTTP modules
61 --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
62 --"http_files"; -- Serve static files from a directory over HTTP
59 63
60 -- Other specific functionality 64 -- Other specific functionality
61 --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. 65 --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
62 --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
63 --"httpserver"; -- Serve static files from a directory over HTTP
64 --"groups"; -- Shared roster support 66 --"groups"; -- Shared roster support
65 --"announce"; -- Send announcement to all online users 67 --"announce"; -- Send announcement to all online users
66 --"welcome"; -- Welcome users who register accounts 68 --"welcome"; -- Welcome users who register accounts
67 --"watchregistrations"; -- Alert admins of registrations 69 --"watchregistrations"; -- Alert admins of registrations
68 --"motd"; -- Send a message to users when they log in 70 --"motd"; -- Send a message to users when they log in