X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody.cfg.lua.dist;h=8e12f92221c5614c0f020f0b3dca2efc8faae304;hb=b9a0623db89d777aef42e1150b6100d76895e199;hp=7289921a319ba72b7519f991f2b0b4f922e02e9e;hpb=9b23e2e500c6a449b3564fcce8f8981f95f8c55b;p=prosody.git

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 7289921a..8e12f922 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -1,7 +1,7 @@
 -- Prosody Example Configuration File 
 -- 
 -- If it wasn't already obvious, -- starts a comment, and all 
--- text after it is ignored by Prosody.
+-- text after it on a line is ignored by Prosody.
 --
 -- The config is split into sections, a global section, and one 
 -- for each defined host that we serve. You can add as many host 
@@ -15,12 +15,12 @@
 -- A table is a list of values, except each value has a name. An 
 -- example would be:
 --
--- logging = { type = "html", directory = "/var/logs", rotate = "daily" }
+-- ssl = { key = "keyfile.key", certificate = "certificate.cert" }
 --
--- Whitespace (that is tabs, spaces, line breaks) is insignificant, so can 
+-- Whitespace (that is tabs, spaces, line breaks) is mostly insignificant, so 
+-- can 
 -- be placed anywhere
--- that 	you deem fitting. Youcouldalsoremoveitentirely,butforobviousrea
---sonsIdon'trecommendit.
+-- that 	you deem fitting.
 --
 -- Tip: You can check that the syntax of this file is correct when you have finished
 -- by running: luac -p prosody.cfg.lua
@@ -36,22 +36,36 @@ Host "*"
 	-- This is the list of modules Prosody will load on startup.
 	-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
 	modules_enabled = {
-				"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
-				"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+			-- Generally required
 				"roster"; -- Allow users to have a roster. Recommended ;)
-				"register"; -- Allow users to register on this server using a client
+				"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
 				"tls"; -- Add support for secure TLS on c2s/s2s connections
-				"vcard"; -- Allow users to set vCards
-				"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 5582 (needs console_enabled = true)
+			
+			-- Not essential, but recommended
+				"private"; -- Private XML storage (for room bookmarks, etc.)
+				"vcard"; -- Allow users to set vCards
+			
+			-- Nice to have
+				"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+				"version"; -- Replies to server version requests
+			  	"uptime"; -- Report how long server has been running
+			  	"time"; -- Let others know the time here on this server
+			  	"ping"; -- Replies to XMPP pings with pongs
+				"register"; -- Allow users to register on this server using a client and change passwords
+
+			-- Other specific functionality
+				--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+			  	--"console"; -- telnet to port 5582 (needs console_enabled = true)
+				--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+				--"httpserver"; -- Serve static files from a directory over HTTP
 			  };
 	
+	-- 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 = { 
@@ -75,3 +89,6 @@ Host "example.com"
 		}
 
 	enabled = false -- This will disable the host, preserving the config, but denying connections
+
+-- Set up a MUC (multi-user chat) room server on conference.example.com:
+Component "conference.example.com" "muc"