X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody.cfg.lua.dist;h=6cd928406dea63183a16e571e78aaf6a8d6883dd;hb=9f89e636a73c1291918a9d9c13f0e61cc9e08eb4;hp=a17eb8773aaaababdb3cffe49ecb5419f61860f7;hpb=416b600dd4475c7862070514895eb9314789d5e2;p=prosody.git

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index a17eb877..6cd92840 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -1,8 +1,8 @@
 -- Prosody Example Configuration File
--- 
+--
 -- Information on configuring Prosody can be found on our
 -- website at http://prosody.im/doc/configure
--- 
+--
 -- Tip: You can check that the syntax of this file is correct
 -- when you have finished by running: luac -p prosody.cfg.lua
 -- If there are any errors, it will let you know what and where
@@ -52,6 +52,8 @@ modules_enabled = {
 		"ping"; -- Replies to XMPP pings with pongs
 		"pep"; -- Enables users to publish their mood, activity, playing music and more
 		"register"; -- Allow users to register on this server using a client and change passwords
+		"adhoc"; -- Support for "ad-hoc commands" that can be executed with an XMPP client
+		"admin_adhoc"; -- Offer a range of administrative ad-hoc commands to server admins
 
 	-- Other specific functionality
 		--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
@@ -65,7 +67,7 @@ modules_enabled = {
 };
 
 -- These modules are auto-loaded, should you
--- for (for some mad reason) want to disable
+-- (for some mad reason) want to disable
 -- them then uncomment them below
 modules_disabled = {
 	-- "presence";
@@ -76,7 +78,7 @@ modules_disabled = {
 -- Disable account creation by default, for security
 -- For more information see http://prosody.im/doc/creating_accounts
 allow_registration = false;
-	
+
 -- These are the SSL/TLS-related settings. If you don't want
 -- to use SSL/TLS, you may comment or remove this
 ssl = {
@@ -106,7 +108,7 @@ VirtualHost "example.com"
 	-- set in the global section (if any).
 	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
 	-- use the global one.
-	ssl = { 
+	ssl = {
 		key = "certs/example.com.key";
 		certificate = "certs/example.com.crt";
 	}