Rename m_nokillservices.so to no_kill_services.so per the naming scheme.

[solanum.git] / doc / reference.conf

diff --git a/doc/reference.conf b/doc/reference.conf
index b8890b0aa44444859eecb728957fb23bdab3bbe1..7e63891519493e201933f28965402ba07b5042db 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -70,7 +70,7 @@
  * Remote oper up notices                            -- sno_globaloper.so
  * /whois notifications (snomask +W)                 -- sno_whois.so
  * Oper-override (modehacking only)                  -- override.so
- * Stop services kills                               -- m_nokillservices.so
+ * Stop services kills                               -- no_kill_services.so
  */
 #loadmodule "extensions/chm_adminonly.so";
 #loadmodule "extensions/chm_operonly.so";
@@ -98,7 +98,7 @@
 #loadmodule "extensions/sno_globaloper.so";
 #loadmodule "extensions/sno_whois.so";
 #loadmodule "extensions/override.so";
-#loadmodule "extensions/m_nokillservices.so";
+#loadmodule "extensions/no_kill_services.so";
 
 /* serverinfo {}:  Contains information about the server. (OLD M:) */
 serverinfo {
@@ -843,6 +843,16 @@ serverhide {
  * IPv4 is currently the default as few blacklists support IPv6 operation
  * as of this writing.
  *
+ * As of charybdis 3.5, a matches parameter is allowed; if omitted, any result
+ * is considered a match. If included, a comma-separated list of *quoted*
+ * strings is allowed to match queries. They may be of the format "0" to "255"
+ * to match the final octet (e.g. 127.0.0.1) or "127.x.y.z" to explicitly match
+ * an A record. The blacklist is only applied if it matches anything in the
+ * list. You may freely mix full IP's and final octets.
+ * 
+ * Consult your blacklist provider for the meaning of these parameters; they
+ * are usually used to denote different ban types.
+ *
  * Note: AHBL (the providers of the below *.ahbl.org BLs) request that they be
  * contacted, via email, at admins@2mbit.com before using these BLs.
  * See <http://www.ahbl.org/services.php> for more information.
@@ -860,8 +870,9 @@ blacklist {
 #      type = ipv4;
 #      reject_reason = "${nick}, your IP (${ip}) is listed as a TOR exit node. In order to protect ${network-name} from tor-based abuse, we are not allowing TOR exit nodes to connect to our network.";
 #
-       /* Example of a blacklist that supports both IPv4 and IPv6 */
+       /* Example of a blacklist that supports both IPv4 and IPv6 and using matches */
 #      host = "foobl.blacklist.invalid";
+#      matches = "4", "6", "127.0.0.10";
 #      type = ipv4, ipv6;
 #      reject_reason = "${nick}, your IP (${ip}) is listed in ${dnsbl-host} for some reason. In order to protect ${network-name} from abuse, we are not allowing connections listed in ${dnsbl-host} to connect";
 };