Document special characters in stats i/testmask in sgml.

[irc/rqf/shadowircd.git] / doc / example.conf

diff --git a/doc/example.conf b/doc/example.conf
index 0a0927f495e3a669364d7e218cf50daf6653f576..35a1b55d14fdd99b64d4c5afec7272aa44c0fdb1 100755 (executable)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -4,7 +4,7 @@
  * Copyright (C) 2002-2005 ircd-ratbox development team
  * Copyright (C) 2005-2006 charybdis development team
  *
- * $Id: example.conf 3446 2007-05-14 22:21:16Z jilles $
+ * $Id: example.conf 3582 2007-11-17 21:55:48Z jilles $
  *
  * See reference.conf for more information.
  */
@@ -26,10 +26,10 @@
 #loadmodule "extensions/sno_farconnect.so";
 #loadmodule "extensions/sno_globalkline.so";
 #loadmodule "extensions/sno_globaloper.so";
+#loadmodule "extensions/sno_whois.so";
 
 serverinfo {
        name = "hades.arpa";
-       use_ts6 = yes;
        sid = "42X";
        description = "charybdis test server";
        network_name = "AthemeNET";
@@ -116,8 +116,11 @@ listen {
  * then general access, then restricted.
  */
 auth {
-       /* user: the user@host allowed to connect.  multiple IPv4/IPv6 user 
-        * lines are permitted per auth block.
+       /* user: the user@host allowed to connect.  Multiple IPv4/IPv6 user
+        * lines are permitted per auth block.  This is matched against the
+        * hostname and IP address (using :: shortening for IPv6 and
+        * prepending a 0 if it starts with a colon) and can also use CIDR
+        * masks.
         */
        user = "*@172.16.0.0/12";
        user = "*test@123D:B567:*";
@@ -209,11 +212,11 @@ operator "god" {
         * global_kill:  allows local and remote users to be 
         *               /KILL'd                           (OLD 'O' flag)
         * remote:       allows remote SQUIT and CONNECT   (OLD 'R' flag)
-        * kline:        allows KILL, KLINE and DLINE      (OLD 'K' flag)
+        * kline:        allows KLINE and DLINE            (OLD 'K' flag)
         * unkline:      allows UNKLINE and UNDLINE        (OLD 'U' flag)
         * gline:        allows GLINE                      (OLD 'G' flag)
         * nick_changes: allows oper to see nickchanges    (OLD 'N' flag)
-        *               via usermode +n
+        *               via snomask +n
         * rehash:       allows oper to REHASH config      (OLD 'H' flag)
         * die:          allows DIE and RESTART            (OLD 'D' flag)
         * admin:        gives admin privileges.  admins
@@ -223,11 +226,13 @@ operator "god" {
         *               will not have the admin lines in
         *               stats p and whois.
         * xline:        allows use of /quote xline/unxline
-        * operwall:     allows the oper to send operwalls [DEFAULT]
+        * resv:         allows /quote resv/unresv and cmode +LP [DEFAULT]
+        * operwall:     allows the oper to send/receive operwalls [DEFAULT]
         * oper_spy:     allows 'operspy' features to see through +s
         *               channels etc. see /quote help operspy
         * hidden_oper:  hides the oper from /stats p    (OLD UMODE +p) 
         * remoteban:    allows remote kline etc [DEFAULT]
+        * mass_notice:  allows sending wallops and mass notices [DEFAULT]
          */
        flags = global_kill, remote, kline, unkline, gline,
                die, rehash, admin, xline, operwall;
@@ -242,7 +247,8 @@ connect "irc.uplink.com" {
        class = "server";
        flags = compressed, topicburst;
 
-       /* If the connection is IPv6, uncomment below */
+       /* If the connection is IPv6, uncomment below.
+        * Use 0::1, not ::1, for IPv6 localhost. */
        #aftype = ipv6;
 };
 
@@ -260,7 +266,7 @@ shared {
        flags = all, rehash;
 };
 
-/* exempt {}: IPs that are exempt from Dlines. (OLD d:) */
+/* exempt {}: IPs that are exempt from Dlines and rejectcache. (OLD d:) */
 exempt {
        ip = "127.0.0.1";
 };
@@ -309,17 +315,20 @@ serverhide {
  *   ${nick}         - the user's nickname
  *   ${network-name} - the name of the network
  *
- * Note: AHBL (the providers of the below BLs) request that they be
+ * 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.
  */
-#blacklist {
+blacklist {
+       host = "dnsbl.dronebl.org";
+       reject_reason = "${nick}, your IP (${ip}) is listed in DroneBL. For assistance, see http://dronebl.org/lookup_branded.do?ip=${ip}&network=${network-name}";
+
 #      host = "ircbl.ahbl.org";
 #      reject_reason = "${nick}, your IP (${ip}) is listed in ${dnsbl-host} for having an open proxy. In order to protect ${network-name} from abuse, we are not allowing connections with open proxies to connect.";
 #
 #      host = "tor.ahbl.org";
 #      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.";
-#};
+};
 
 alias "NickServ" {
        target = "NickServ";
@@ -373,7 +382,6 @@ general {
         default_floodcount = 10;
        failed_oper_notice = yes;
        dots_in_ident=2;
-        dot_in_ip6_addr = no;
        min_nonwildcard = 4;
        min_nonwildcard_simple = 3;
         max_accept = 100;