Rework the config file reader to be much more flexible and move many configuration directives to the actual modules they are used in.

1 files changed, 46 insertions, 38 deletions

diff --git a/data/modules.example.conf b/data/modules.example.conf
index ef862221f..f1a5b8d7f 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -21,9 +21,10 @@ module { name = "help" }
  * Adds support for the DNS protocol. By itself this module does nothing useful,
  * but other modules such as m_dnsbl and os_dns require this.
  */
-#module { name = "m_dns" }
-dns
+#module
 {
+	name = "m_dns"
+
 	/*
 	 * The nameserver to use for resolving hostnames, must be an IP or a resolver configuration file.
 	 * The below should work fine on all unix like systems. Windows users will have to find their nameservers
@@ -74,9 +75,10 @@ dns
  * is found on the blacklist they will be immediately banned. This is a crucial module
  * to prevent bot attacks.
  */
-#module { name = "m_dnsbl" }
-m_dnsbl
+#module
 {
+	name = "m_dnsbl"
+
 	/*
 	 * If set, Services will check clients against the DNSBLs when services connect to its uplink.
 	 * This is not recommended, and on large networks will open a very large amount of DNS queries.
@@ -136,9 +138,10 @@ blacklist
  *
  * Gives users who are op in the specified help channel usermode +h (helpop).
  */
-#module { name = "m_helpchan" }
-m_helpchan
+#module
 {
+	name = "m_helpchan"
+
 	helpchannel = "#help"
 }
 
@@ -324,9 +327,10 @@ mysql
  * back to services. If services are able to connect through the proxy to itself
  * then it knows it is an insecure proxy, and will ban it.
  */
-#module { name = "m_proxyscan" }
-m_proxyscan
+#module
 {
+	name = "m_proxyscan"
+
 	/*
 	 * The target IP services tells the proxy to connect back to. This must be a publicly
 	 * avaiable IP that remote proxies can connect to.
@@ -402,9 +406,10 @@ proxyscan
  * This module allows authenticating users against an external SQL database using a custom
  * query.
  */
-#module { name = "m_sql_authentication" }
-m_sql_authentication
+#module
 {
+	name = "m_sql_authentication"
+
 	/* SQL engine to use. Should be configured elsewhere with m_mysql, m_sqlite, etc. */
 	engine = "mysql/main"
 
@@ -446,9 +451,10 @@ m_sql_authentication
  * This module allows granting users services operator privileges and possibly IRC Operator
  * privileges based on an external SQL database using a custom query.
  */
-#module { name = "m_sql_oper" }
-m_sql_oper
+module
 {
+	name = "m_sql_oper"
+
 	/* SQL engine to use. Should be configured elsewhere with m_mysql, m_sqlite, etc. */
 	engine = "mysql/main"
 
@@ -509,37 +515,38 @@ module { name = "m_regex_pcre" }
  */
 module { name = "m_rewrite" }
 #command
-#{
-#	service = "ChanServ"; name = "CLEAR"; command = "rewrite"
-#
-#	/* Enable m_rewrite. */
-#	rewrite = true
-#
-#	/* Source message to match. A $ can be used to match anything. */
-#	rewrite_source = "CLEAR $ USERS"
-#
-#	/*
-#	 * Message to rewrite the source message to. A $ followed by a number, eg $0, gets
-#	 * replaced by the number-th word from the source_message, starting from 0.
-#	 */
-#	rewrite_target = "KICK $1 *"
-#
-#	/*
-#	 * The command description. This only shows up in HELP's output.
-#	 * Comment this option to prevent the command from showing in the
-#	 * HELP command.
-#	 */
-#	rewrite_description = "Clears all users from a channel"
-#}
+{
+	service = "ChanServ"; name = "CLEAR"; command = "rewrite"
+
+	/* Enable m_rewrite. */
+	rewrite = true
+
+	/* Source message to match. A $ can be used to match anything. */
+	rewrite_source = "CLEAR $ USERS"
+
+	/*
+	 * Message to rewrite the source message to. A $ followed by a number, eg $0, gets
+	 * replaced by the number-th word from the source_message, starting from 0.
+	 */
+	rewrite_target = "KICK $1 *"
+
+	/*
+	 * The command description. This only shows up in HELP's output.
+	 * Comment this option to prevent the command from showing in the
+	 * HELP command.
+	 */
+	rewrite_description = "Clears all users from a channel"
+}
 
 /*
  * m_ssl
  *
  * This module uses SSL to connect to the uplink server(s).
  */
-#module { name = "m_ssl" }
-ssl
+module
 {
+	name = "m_ssl"
+
 	/*
 	 * An optional certificate and key for m_ssl to give to the uplink.
 	 *
@@ -582,9 +589,10 @@ m_xmlrpc
  *
  * This module requires m_httpd.
  */
-#module { name = "webcpanel" }
-webcpanel
+#module
 {
+	name = "webcpanel"
+
 	/* Web server to use. */
 	server = "httpd/main";