Update the rest of modules.example.conf, default inspircd status modes to a sane rank incase they are prefixless, and 50 other things

2 files changed, 126 insertions, 108 deletions

diff --git a/data/modules.example.conf b/data/modules.example.conf
index f1a5b8d7f..ab05542b2 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -98,39 +98,41 @@ module { name = "help" }
 	 * a timed G/K-line to the IRCd and forgets about it. Can be useful if your akill list is being fill up by bots.
 	 */
 	add_to_akill = yes
-}
-blacklist
-{
-	/* Name of the blacklist. */
-	name = "rbl.efnetrbl.org"
-
-	/* How long to set the ban for. */
-	time = 4h
-
-	/* Reason for akill.
-	 * %n is the nick of the user
-	 * %u is the ident/username of the user
-	 * %g is the realname of the user
-	 * %h is the hostname of the user
-	 * %i is the IP of the user
-	 * %r is the reason (configured below). Will be nothing if not configured.
-	 * %N is the network name set in networkinfo:networkname
-	 */
-	reason = "You are listed in the efnet RBL, visit http://rbl.efnetrbl.org/?i=%i for info"
-
-	/* Replies to ban and their reason. If this is totally ommited all replies get banned. */
-	1 = "Open Proxy"
-	/* Don't ban for result 2 or 3 */
-	#2 = "spamtrap666"
-	#3 = "spamtrap50"
-	4 = "TOR"
-	5 = "Drones / Flooding"
-}
-blacklist
-{
-	name = "dnsbl.dronebl.org"
-	time = 4h
-	reason = "You have a host listed in the DroneBL. For more information, visit http://dronebl.org/lookup_branded.do?ip=%i&network=%N"
+
+	blacklist
+	{
+		/* Name of the blacklist. */
+		name = "rbl.efnetrbl.org"
+
+		/* How long to set the ban for. */
+		time = 4h
+
+		/* Reason for akill.
+		 * %n is the nick of the user
+		 * %u is the ident/username of the user
+		 * %g is the realname of the user
+		 * %h is the hostname of the user
+		 * %i is the IP of the user
+		 * %r is the reason (configured below). Will be nothing if not configured.
+		 * %N is the network name set in networkinfo:networkname
+		 */
+		reason = "You are listed in the efnet RBL, visit http://rbl.efnetrbl.org/?i=%i for info"
+
+		/* Replies to ban and their reason. If this is totally ommited all replies get banned. */
+		1 = "Open Proxy"
+		/* Don't ban for result 2 or 3 */
+		#2 = "spamtrap666"
+		#3 = "spamtrap50"
+		4 = "TOR"
+		5 = "Drones / Flooding"
+	}
+
+	blacklist
+	{
+		name = "dnsbl.dronebl.org"
+		time = 4h
+		reason = "You have a host listed in the DroneBL. For more information, visit http://dronebl.org/lookup_branded.do?ip=%i&network=%N"
+	}
 }
 
 /*
@@ -153,33 +155,37 @@ blacklist
  * Note that using this will allow users to get the IP of your services.
  * To prevent this we recommend using a reverse proxy or a tunnel.
  */
-#module { name = "m_httpd" }
-httpd
+#module
 {
-	/* Name of this service. */
-	name = "httpd/main"
+	name = "m_httpd"
 
-	/* IP to listen on. */
-	ip = "0.0.0.0"
+	httpd
+	{
+		/* Name of this service. */
+		name = "httpd/main"
 
-	/* Port to listen on. */
-	port = 8080
+		/* IP to listen on. */
+		ip = "0.0.0.0"
 
-	/* Time before connections to this server are timed out. */
-	timeout = 30
+		/* Port to listen on. */
+		port = 8080
 
-	/* Listen using SSL. Requires m_ssl. */
-	#ssl = yes
+		/* Time before connections to this server are timed out. */
+		timeout = 30
 
-	/* If you are using a reverse proxy that sends one of the
-	 * extforward_headers set below, set this to its IP.
-	 * This allows services to obtain the real IP of users by
-	 * reading the forwarded-for HTTP header.
-	 */
-	#extforward_ip = "192.168.0.255"
+		/* Listen using SSL. Requires m_ssl. */
+		#ssl = yes
 
-	/* The header to look for. These probably work as is. */
-	extforward_header = "X-Forwarded-For Forwarded-For"
+		/* If you are using a reverse proxy that sends one of the
+		 * extforward_headers set below, set this to its IP.
+		 * This allows services to obtain the real IP of users by
+		 * reading the forwarded-for HTTP header.
+		 */
+		#extforward_ip = "192.168.0.255"
+
+		/* The header to look for. These probably work as is. */
+		extforward_header = "X-Forwarded-For Forwarded-For"
+	}
 }
 
 /*
@@ -187,17 +193,21 @@ httpd
  *
  * This module allows other modules to use LDAP. By itself, this module does nothing useful.
  */
-#module { name = "m_ldap" }
-ldap
+#module
 {
-	server = "ldap://127.0.0.1"
-	port = 389
-
-	/*
-	 * Admin credentials used for performing searches and adding users.
-	 */
-	admin_binddn = "cn=Manager,dc=anope,dc=org"
-	admin_password = "secret"
+	name = "m_ldap"
+
+	ldap
+	{
+		server = "ldap://127.0.0.1"
+		port = 389
+
+		/*
+		 * Admin credentials used for performing searches and adding users.
+		 */
+		admin_binddn = "cn=Manager,dc=anope,dc=org"
+		admin_password = "secret"
+	}
 }
 
 /*
@@ -206,9 +216,10 @@ ldap
  * This module allows many commands such as IDENTIFY, RELEASE, RECOVER, GHOST, etc. use
  * LDAP to authenticate users. Requires m_ldap.
 */
-#module { name = "m_ldap_authentication" }
-m_ldap_authentication
+#module
 {
+	name = "m_ldap_authentication"
+
 	/*
 	 * The distinguished name used for searching for users's accounts.
 	 */
@@ -265,9 +276,10 @@ m_ldap_authentication
  *
  * Note that this doesn't give the user privileges on the IRCd, only in Services.
  */
-#module { name = "m_ldap_oper" }
-m_ldap_oper
+#module
 {
+	name = "m_ldap_oper"
+
 	/*
 	 * An optional binddn to use when searching for groups.
 	 * %a is replaced with the account name of the user.
@@ -302,16 +314,20 @@ m_ldap_oper
  *
  * This module allows other modules to use MySQL.
  */
-#module { name = "m_mysql" }
-mysql
+#module
 {
-	/* The name of this service. */
-	name = "mysql/main"
-	database = "anope"
-	server = "127.0.0.1"
-	username = "anope"
-	password = "mypassword"
-	port = 3306
+	name = "m_mysql"
+
+	mysql
+	{
+		/* The name of this service. */
+		name = "mysql/main"
+		database = "anope"
+		server = "127.0.0.1"
+		username = "anope"
+		password = "mypassword"
+		port = 3306
+	}
 }
 
 /*
@@ -374,30 +390,26 @@ mysql
 	 * How long before connections should be timed out.
 	 */
 	timeout = 5
-}
-
-/*
- * A proxyscan block (must have m_proxyscan loaded).
- * You may have multiple proxyscan blocks.
- */
-proxyscan
-{
-	/* The type of proxy to check for. A comma separated list is allowed. */
-	type = "HTTP"
-
-	/* The ports to check. */
-	port = "80,8080"
 
-	/* How long to set the ban for. */
-	time = 4h
-
-	/*
-	 * The reason to ban the user for.
-	 * %h is replaced with the type of proxy found.
-	 * %i is replaced with the IP of proxy found.
-	 * %p is replaced with the port.
-	 */
-	reason = "You have an open proxy running on your host (%t:%i:%p)"
+	proxyscan
+	{
+		/* The type of proxy to check for. A comma separated list is allowed. */
+		type = "HTTP"
+
+		/* The ports to check. */
+		port = "80,8080"
+
+		/* How long to set the ban for. */
+		time = 4h
+
+		/*
+		 * The reason to ban the user for.
+		 * %h is replaced with the type of proxy found.
+		 * %i is replaced with the IP of proxy found.
+		 * %p is replaced with the port.
+		 */
+		reason = "You have an open proxy running on your host (%t:%i:%p)"
+	}
 }
 
 /*
@@ -476,14 +488,19 @@ module
  *
  * This module allows other modules to use SQLite.
  */
-#module { name = "m_sqlite" }
-sqlite
+#module
 {
-	/* The name of this service. */
-	name = "sqlite/main"
+	name = "m_sqlite"
 
-	/* The database name, it will be created if it does not exist. */
-	database = "anope.db"
+	/* A SQLite database */
+	sqlite
+	{
+		/* The name of this service. */
+		name = "sqlite/main"
+
+		/* The database name, it will be created if it does not exist. */
+		database = "anope.db"
+	}
 }
 
 /*
@@ -565,9 +582,10 @@ module
  * Allows remote applications (websites) to execute queries in real time to retrieve data from Anope.
  * By itself this module does nothing, but allows other modules (m_xmlrpc_main) to receive and send XMLRPC queries.
  */
-#module { name = "m_xmlrpc" }
-m_xmlrpc
+#module
 {
+	name = "m_xmlrpc"
+
 	/* Web service to use. Requires m_httpd. */
 	server = "httpd/main"
 }
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index 67358b9d6..075a4b79e 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -440,7 +440,7 @@ module
 	 *
 	 * This directive is optional.
 	 */
-	#nickregdelay = 30
+	#nickregdelay = 30s
 }
 
 command { service = "NickServ"; name = "CONFIRM"; command = "nickserv/confirm"; }