Tons of comments

[user/henk/code/inspircd.git] / docs / inspircd.conf.example

diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index e0047913f15b80859e6a2d8ba7a18b97206a6891..e6f5d8ea1b46bbb16b2c20e5b8e993106d7561e0 100644 (file)
--- a/docs/inspircd.conf.example
+++ b/docs/inspircd.conf.example
@@ -168,6 +168,8 @@
 #       <connect allow="ip mask" localmax="3" globalmax="3">          #
 #       <connect deny="ip mask">                                      #
 #                                                                     #
+#   IP masks may be specified in CIDR format for IPV4 and IPV6.       #
+#                                                                     #
 #   You may optionally include timeout="x" on any allow line, which   #
 #   specifies the amount of time given before an unknown connection   #
 #   is closed if USER/NICK/PASS are not given. This value is in secs  #
@@ -220,7 +222,7 @@
 <connect allow="*" timeout="60" flood="10" threshold="60" pingfreq="120" sendq="262144" recvq="4096" localmax="3" globalmax="3">
 
 <connect deny="69.254.*">
-<connect deny="3ffe:*">
+<connect deny="3ffe::0/32">
 
 
 #-#-#-#-#-#-#-#-#-#-#-#-  CLASS CONFIGURATION   -#-#-#-#-#-#-#-#-#-#-#-
@@ -301,6 +303,7 @@
 #                                                                     #
 #  host      - host of client allowed to oper-up.                     #
 #              wildcards accepted, seperate multiple hosts with space #
+#              You may also specify CIDR ip addresses.                #
 #                                                                     #
 #  type      - specified above, defines the kind of operator          #
 #                                                                     #
@@ -313,7 +316,7 @@
 
 <oper   name="katsklaw"
         password="s3cret"
-        host="ident@dialup15.isp.com *@localhost *@server.com"
+        host="ident@dialup15.isp.com *@localhost *@server.com *@3ffe::0/16"
         type="NetAdmin">
 
 
@@ -915,7 +918,8 @@
 # Optional - If you choose to use the m_httpd.so module,  then you must
 # specify the port number and other details of your http server:
 #
-#<http ip="192.168.1.10" host="brainwave" port="32006" index="/home/brain/inspircd/http/index.html">
+#<http ip="192.168.1.10" host="brainwave" port="32006"
+#      index="/home/brain/inspircd/http/index.html">
 #
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
@@ -1269,6 +1273,11 @@
 # Timed bans module: Adds timed bans and the /TBAN command
 #<module name="m_timedbans.so">
 
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+# Test line module: Adds the /TLINE command, used to test how many
+# users a /GLINE or /ZLINE etc would match.
+#<module name="m_tline.so">
+
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Uninvite module: Adds the /UNINVITE command which lets users remove
 # pending invites from channels without waiting for the user to join.
@@ -1308,6 +1317,7 @@
 # badip lines ban an ip range (same as a zline)                       #
 #                                                                     #
 # ipmask       -          The ip range to ban (wildcards possible)    #
+#                         CIDR is supported in the IP mask.           #
 # reason       -          Reason to display when disconnected         #
 #                                                                     #
 # badnick lines ban a nick mask (same as a qline)                     #
@@ -1318,11 +1328,13 @@
 # badhost lines ban a user@host mask (same as a kline)                #
 #                                                                     #
 # host         -          ident@hostname (wildcards possible)         #
+#                         If you specify an IP, CIDR is supported.    #
 # reason       -          Reason to display on disconnection          #
 #                                                                     #
 # exception lines define a hostmask that is excempt from [kzg]lines   #
 #                                                                     #
 # host         -          ident@hostname (wildcards possible)         #
+#                         If you specify an IP, CIDR is supported.    #
 # reason       -          Reason, shown only in /stats e              #
 #                                                                     #
 
@@ -1335,6 +1347,7 @@
 
 <badhost host="*@hundredz.n.hundredz.o.1337.kiddies.com" reason="Too many 1337 kiddiots">
 <badhost host="*@localhost" reason="No irc from localhost!">
+<badhost host="*@172.32.0.0/16" reason="This subnet is bad.">
 
 <exception host="*@ircop.host.com" reason="Opers hostname">