X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody.cfg.lua.dist;h=38618131b79de218e30b5a4137a713d19c60bd5b;hb=d6ac47c50ec04d29c21929db2468d093d58083a3;hp=182f88893233acd01e45b1fe10dcc6dfce88fd06;hpb=c0c83da1a045258025a2825f437af7a5e602c9c9;p=prosody.git

diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 182f8889..38618131 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -8,19 +8,18 @@
 -- sections as you like.
 --
 -- Lists are written { "like", "this", "one" } 
--- Lists can also be of { 1, 2, 3 } numbers, etc. 
+-- Lists can also be of { 1, 2, 3 } numbers, and other things. 
 -- Either commas, or semi-colons; may be used
 -- as seperators.
 --
 -- A table is a list of values, except each value has a name. An 
--- example would be:
+-- example table would be:
 --
 -- ssl = { key = "keyfile.key", certificate = "certificate.cert" }
 --
 -- Whitespace (that is tabs, spaces, line breaks) is mostly insignificant, so 
 -- can 
--- be placed anywhere
--- that 	you deem fitting.
+-- be placed anywhere 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
@@ -30,7 +29,7 @@
 -- The only thing left to do is rename this file to remove the .dist ending, and fill in the 
 -- blanks. Good luck, and happy Jabbering!
 
--- Global settings go in this section
+-- Server-wide settings go in this section
 Host "*"
 	
 	-- This is the list of modules Prosody will load on startup.
@@ -38,7 +37,6 @@ Host "*"
 	modules_enabled = {
 			-- Generally required
 				"roster"; -- Allow users to have a roster. Recommended ;)
-				"presence"; -- See and broadcast status changes to/from contacts
 				"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
 				"tls"; -- Add support for secure TLS on c2s/s2s connections
 				"dialback"; -- s2s dialback support
@@ -54,15 +52,29 @@ Host "*"
 			  	"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
+			  	"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
 
 			-- Other specific functionality
-				--"register"; -- Allow users to register on this server using a client
 				--"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
 			  };
 	
+	-- These modules are auto-loaded, should you
+	-- for (for some mad reason) want to disable
+	-- them then uncomment them below
+	modules_disabled = {
+			-- "presence";
+			-- "message";
+			-- "iq";
+	};
+
+	-- 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 = { 
@@ -76,6 +88,9 @@ Host "localhost"
 -- Section for example.com
 -- (replace example.com with your domain name)
 Host "example.com"
+
+	enabled = false -- This will disable the host, preserving the config, but denying connections
+
 	-- Assign this host a certificate for TLS, otherwise it would use the one
 	-- set in the global section (if any).
 	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
@@ -85,7 +100,5 @@ Host "example.com"
 		certificate = "certs/example.com.crt";
 		}
 
-	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"