ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/doc/reference.conf
(Generate patch)

Comparing ircd-hybrid/trunk/doc/reference.conf (file contents):
Revision 2210 by michael, Wed Jun 5 21:15:55 2013 UTC vs.
Revision 4162 by michael, Thu Jul 3 19:39:31 2014 UTC

# Line 1 | Line 1
1 < /* ircd-hybrid reference configuration file
2 < * Copyright (C) 2000-2013 Hybrid Development Team
1 > /*
2 > * This is an example configuration file for ircd-hybrid
3   *
4 < * Written by ejb, wcampbel, db, leeh and others
4 > * Copyright (c) 2000-2014 ircd-hybrid development team
5   *
6   * $Id$
7   */
8  
9   /*
10   * ########################################################################
11 < * IMPORTANT NOTES:
11 > * IMPORTANT NOTE:
12   *
13 < * auth {} blocks MUST be specified in order of precedence.  The first one
14 < * that matches a user will be used.  So place spoofs first, then specials,
13 > * auth {} blocks MUST be specified in order of precedence. The first one
14 > * that matches a user will be used. So place spoofs first, then specials,
15   * then general access.
16   * ########################################################################
17   *
# Line 23 | Line 23
23   *
24   * Times/durations are written as:
25   *        12 hours 30 minutes 1 second
26 < *        
26 > *
27   * Valid units of time:
28   *        year, month, week, day, hour, minute, second
29   *
30   * Valid units of size:
31   *        megabyte/mbyte/mb, kilobyte/kbyte/kb, byte
32   *
33 < * Sizes and times may be singular or plural.  
34 < */
33 > * Sizes and times may be singular or plural.
34 > */
35  
36  
37   /*
# Line 39 | Line 39
39   */
40   serverinfo {
41          /*
42 <         * name: the name of this server.  This cannot be changed at runtime.
42 >         * name: the name of this server. This cannot be changed at runtime.
43           */
44          name = "hades.arpa";
45  
46          /*
47 <         * sid: a server's unique ID.  This is three characters long and must
48 <         * be in the form [0-9][A-Z0-9][A-Z0-9].  The first character must be
47 >         * sid: a server's unique ID. This is three characters long and must
48 >         * be in the form [0-9][A-Z0-9][A-Z0-9]. The first character must be
49           * a digit, followed by 2 alpha-numerical letters.
50 +         *
51           * NOTE: The letters must be capitalized. This cannot be changed at runtime.
52           */
53          sid = "0HY";
# Line 76 | Line 77 | serverinfo {
77   #       vhost = "192.169.0.1";
78  
79          /*
80 <         * vhost6: the IP to bind to when we connect outward to ipv6 servers.
81 <         * This should be an ipv6 IP only, or "*" for INADDR_ANY.
80 >         * vhost6: the address to bind to when we make outgoing connections
81 >         * to IPv6 servers. This should be an IPv6 address, or "*" for INADDR_ANY.
82           */
83   #       vhost6 = "3ffe:80e8:546::2";
84  
# Line 98 | Line 99 | serverinfo {
99          max_topic_length = 160;
100  
101          /*
102 <         * rsa_private_key_file: the path to the file containing our
103 <         * rsa key for cryptlink.
102 >         * rsa_private_key_file: the path to the file containing the
103 >         * RSA key.
104 >         *
105 >         * Example commands to store a 2048 bit RSA key in rsa.key:
106           *
104         * Example command to store a 2048 bit RSA keypair in
105         * rsa.key, and the public key in rsa.pub:
106         *
107           *      openssl genrsa -out rsa.key 2048
108 <         *      openssl rsa -in rsa.key -pubout -out rsa.pub
109 <         *      chown <ircd-user>.<ircd.group> rsa.key rsa.pub
108 >         *      chown <ircd-user>.<ircd.group> rsa.key
109           *      chmod 0600 rsa.key
111         *      chmod 0644 rsa.pub
110           */
111   #       rsa_private_key_file = "/usr/local/ircd/etc/rsa.key";
112  
113          /*
114           * ssl_certificate_file: the path to the file containing our
115 <         * ssl certificate for encrypted client connection.
115 >         * SSL certificate for encrypted client connection.
116           *
117           * This assumes your private RSA key is stored in rsa.key. You
118           * MUST have an RSA key in order to generate the certificate.
# Line 138 | Line 136 | serverinfo {
136           * ssl_dh_param_file:
137           *
138           * Path to the PEM encoded Diffie-Hellman parameter file.
139 <         * DH parameters are strictly required when using ciphers
140 <         * with EDH (ephemeral Diffie-Hellman) key exchange.
139 >         * DH parameters are required when using ciphers with EDH
140 >         * (ephemeral Diffie-Hellman) key exchange.
141           *
142           * A DH parameter file can be created by running:
143           *
144 <         *      openssl dhparam -out dhparam.pem 1024
144 >         *      openssl dhparam -out dhparam.pem 2048
145           *
146           * Prime size must be at least 1024 bits. Further information
147           * regarding specific OpenSSL dhparam command-line options
# Line 152 | Line 150 | serverinfo {
150   #       ssl_dh_param_file = "/usr/local/ircd/etc/dhparam.pem";
151  
152          /*
153 +         * ssl_dh_elliptic_curve:
154 +         *
155 +         * Defines the curve to use for the Elliptic Curve Diffie-Hellman (ECDH) algorithm.
156 +         *
157 +         * A list of supported curves by OpenSSL can be obtained by running:
158 +         *
159 +         *      openssl ecparam -list_curves
160 +         */
161 + #       ssl_dh_elliptic_curve = "secp521r1";
162 +
163 +        /*
164           * ssl_cipher_list:
165           *
166 <         * List of ciphers that are supported by _this_ server. Can be used to
166 >         * List of ciphers to support on _this_ server. Can be used to
167           * enforce specific ciphers for incoming SSL/TLS connections.
168 <         * If a client (which also includes incoming server connections) isn't
169 <         * capable of any cipher listed below, the connection will simply be
170 <         * rejected.
168 >         * If a client (which also includes incoming server connections) is not
169 >         * capable of using any of the ciphers listed here, the connection will
170 >         * simply be rejected.
171           *
172 <         * A list of supported ciphers can be obtained by running:
172 >         * A list of supported ciphers by OpenSSL can be obtained by running:
173           *
174           *      openssl ciphers -ssl3 -tls1 -v
175           *
176           * Multiple ciphers are separated by colons. The order of preference is
177           * from left to right.
178           */
179 < #       ssl_cipher_list = "DHE-RSA-AES256-SHA:AES256-SHA";
179 > #       ssl_cipher_list = "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA:AES256-SHA";
180  
181          /*
182 <         * ssl_server_method:
183 <         * ssl_client_method:
182 >         * ssl_message_digest_algorithm:
183 >         *
184 >         * Defines what cryptographic hash function to use for generating fingerprint
185 >         * hashes of X.509 certificates.
186 >         * Default is SHA-256 if nothing else is specified.
187           *
188 <         * SSL/TLS methods we provide for incoming (server method) and
189 <         * outgoing (client method) SSL/TLS connections.
190 <         * This can be either sslv3 for SSLv3, and/or tlsv1 for TLSv1.
188 >         * A list of supported message digest algorithms by OpenSSL can be obtained by running:
189 >         *
190 >         *      openssl list-message-digest-algorithms
191           */
192 < #       ssl_server_method = tlsv1, sslv3;
181 < #       ssl_client_method = tlsv1;
192 > #       ssl_message_digest_algorithm = "sha256";
193   };
194  
195   /*
# Line 205 | Line 216 | class {
216  
217          /*
218           * number_per_ip: how many local users are allowed to connect
219 <         * from one IP  (optional)
219 >         * from a single IP address  (optional)
220           */
221          number_per_ip = 2;
222  
223          /*
224           * max_local: how many local users are allowed to connect
225 <         * from one ident@host  (optional)
225 >         * from a single ident@host  (optional)
226           */
227          max_local = 2;
228  
# Line 234 | Line 245 | class {
245          number_per_cidr = 16;
246  
247          /*
248 <         * sendq: the amount of data allowed in a clients send queue before
248 >         * sendq: the amount of data allowed in a client's send queue before
249           * they are dropped.
250           */
251          sendq = 100 kbytes;
252  
253          /*
254 <         * recvq: maximum amount of data in a clients receive queue before
254 >         * recvq: the amount of data allowed in a client's receive queue before
255           * they are dropped for flooding. Defaults to 2560 if the chosen
256           * value isn't within the range of 512 to 8000.
257           */
# Line 254 | Line 265 | class {
265          max_number = 100;
266          sendq = 100 kbytes;
267  
268 +
269 +        /*
270 +         * max_channels: maximum number of channels users in this class can join.
271 +         */
272 +        max_channels = 60;
273 +
274          /*
275           * min_idle: minimum idle time that is shown in /whois.
276           */
# Line 267 | Line 284 | class {
284          /*
285           * flags:
286           *
287 <         * random_idle          - idle time is randomly selected within the
288 <         *                        range of min_idle to max_idle
289 <         * hide_idle_from_opers - fake idle time will be shown to operators, too
287 >         * random_idle          - a fake idle time is set randomly between
288 >         *                        min_idle and max_idle
289 >         * hide_idle_from_opers - the fake idle time will also be shown to operators
290           */
291          flags = random_idle, hide_idle_from_opers;
292   };
# Line 284 | Line 301 | class {
301           */
302          connectfreq = 5 minutes;
303  
304 <        /* max number: the amount of servers to autoconnect to. */
304 >        /* max number: the number of servers to autoconnect to. */
305          max_number = 1;
306  
307          /* sendq: servers need a higher sendq as they send more data. */
# Line 292 | Line 309 | class {
309   };
310  
311   /*
312 < * motd {}: Allows to show a different MOTD to a client
312 > * motd {}: Allows the display of a different MOTD to a client
313   * depending on its origin. Applies to local users only.
314   */
315   motd {
316          /*
317           * mask: multiple mask entries are permitted. Mask can either be
318 <         * a class name or a hostname.
318 >         * a class name or a hostname. CIDR is supported.
319           */
320          mask = "*.at";
321          mask = "*.de";
# Line 315 | Line 332 | motd {
332   */
333   listen {
334          /*
335 <         * port: the specific port to listen on. If no host is specified
336 <         * before, it will listen on all available IPs.
335 >         * port: the port to listen on. If no host is specified earlier
336 >         * in the listen {} block, it will listen on all available IPs.
337           *
338 <         * Ports are separated via a comma, a range may be specified using ".."
338 >         * Ports are separated by commas; a range may be specified using ".."
339           */
340 <        
341 <        /* port: listen on all available IPs, ports 6665 to 6669 */
340 >
341 >        /* port: listen on all available IP addresses, ports 6665 to 6669 */
342          port = 6665 .. 6669;
343  
344          /*
345 <         * Listen on 192.168.0.1/6697 with ssl enabled and hidden from STATS P
345 >         * Listen on 192.168.0.1/6697 with SSL enabled and hidden from STATS P
346           * unless you are an administrator.
347           *
348 <         * NOTE: The "flags" directive has to come before "port". Always!
348 >         * NOTE: The "flags" directive always has to come before "port".
349           *
350           * Currently available flags are:
351           *
# Line 341 | Line 358 | listen {
358          port = 6697;
359  
360          /*
361 <         * host: set a specific IP/host the ports after the line will listen
362 <         * on. This may be ipv4 or ipv6.
361 >         * host: set a specific IP address/host to listen on using the
362 >         * subsequent port definitions. This may be IPv4 or IPv6.
363           */
364          host = "1.2.3.4";
365          port = 7000, 7001;
# Line 357 | Line 374 | listen {
374   auth {
375          /*
376           * user: the user@host allowed to connect. Multiple user
377 <         * lines are permitted per auth block.
377 >         * lines are permitted within each auth block.
378           */
379          user = "*@172.16.0.0/12";
380          user = "*test@123D:B567:*";
# Line 372 | Line 389 | auth {
389          encrypted = yes;
390  
391          /*
392 <         * spoof: fake the users host to this. This is free-form, just do
392 >         * spoof: fake the user's host to this. This is free-form, just do
393           * everyone a favor and don't abuse it. ('=' prefix on /stats I)
394           */
395          spoof = "I.still.hate.packets";
# Line 402 | Line 419 | auth {
419   auth {
420          /*
421           * redirect: the server and port to redirect a user to. A user does not
422 <         * have to obey the redirection, the ircd just suggests an alternative
422 >         * have to obey the redirection; the ircd just suggests an alternative
423           * server for them.
424           */
425          redirserv = "this.is.not.a.real.server";
426          redirport = 6667;
427 <        
427 >
428          user = "*.server";
429  
430          /* class: a class is required even though it is not used */
# Line 428 | Line 445 | operator {
445          name = "sheep";
446  
447          /*
448 <         * user: the user@host required for this operator. Multiple
449 <         * user="" lines are supported.
448 >         * user: the user@host required for this operator. Multiple user
449 >         * lines are permitted within each operator block.
450           */
451          user = "*sheep@192.168.0.0/16";
452          user = "*@127.0.0.0/8";
# Line 439 | Line 456 | operator {
456           * need to be encrypted by using the provided mkpasswd tool.
457           * Several password hash algorithms are available depending
458           * on your system's crypt() implementation. For example, a modern
459 <         * glibc already has support for SHA-256/512, and MD5 encryption
459 >         * glibc already has support for the SHA-256/512 and MD5 encryption
460           * algorithms.
461           */
462          password = "$5$x5zof8qe.Yc7/bPp$5zIg1Le2Lsgd4CvOjaD20pr5PmcfD7ha/9b2.TaUyG4";
# Line 452 | Line 469 | operator {
469  
470          /*
471           * rsa_public_key_file: the public key for this oper when using Challenge.
472 <         * A password should not be defined when this is used, see
472 >         * A password should not be defined when this is used; see
473           * doc/challenge.txt for more information.
474           */
475   #       rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
476  
477 +        /*
478 +         * ssl_certificate_fingerprint: enhances security by additionally checking
479 +         * the oper's client certificate fingerprint against the specified
480 +         * fingerprint below.
481 +         *
482 +         * Hint: your users can use the following command to obtain a SHA-256 hash
483 +         * of their ssl certificate:
484 +         *
485 +         *      openssl x509 -sha256 -noout -fingerprint -in cert.pem | sed -e 's/^.*=//;s/://g'
486 +         */
487 + #       ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D";
488 +
489 +        /*
490 +         * ssl_connection_required: client must be connected over SSL/TLS
491 +         * in order to be able to use this oper{} block.
492 +         * Default is 'no' if nothing else is specified.
493 +         */
494 +        ssl_connection_required = no;
495 +
496          /* class: the class the oper joins when they successfully /oper */
497          class = "opers";
498  
499          /*
500 <         * umodes: default usermodes opers get when they /oper. If defined,
500 >         * umodes: the default usermodes opers get when they /oper. If defined,
501           * it will override oper_umodes settings in general {}.
502           * Available usermodes:
503           *
# Line 475 | Line 511 | operator {
511           * +G - softcallerid - Server Side Ignore for users not on your channels
512           * +g - callerid     - Server Side Ignore (for privmsgs etc)
513           * +H - hidden       - Hides operator status to other users
514 <         * +i - invisible    - Not shown in NAMES or WHO unless you share a
479 <         *                     a channel
514 >         * +i - invisible    - Not shown in NAMES or WHO unless you share a channel
515           * +j - rej          - See rejected client notices
516           * +k - skill        - See server generated KILL messages
517           * +l - locops       - See LOCOPS messages
518           * +n - nchange      - See client nick changes
519 +         * +p - hidechans    - Hides channel list in WHOIS
520 +         * +q - hideidle     - Hides idle and signon time in WHOIS
521           * +R - nononreg     - Only receive private messages from registered clients
522           * +s - servnotice   - See general server notices
523           * +u - unauth       - See unauthorized client notices
524           * +w - wallop       - See server generated WALLOPS
525           * +y - spy          - See LINKS, STATS, TRACE notices etc.
489         * +z - operwall     - See oper generated WALLOPS
526           */
527 <        umodes = locops, servnotice, operwall, wallop;
527 >        umodes = locops, servnotice, wallop;
528  
529          /*
530 <         * privileges: controls the activities and commands an oper is
530 >         * privileges: controls the activities and commands an oper is
531           * allowed to do on the server. All options default to no.
532           * Available options:
533           *
# Line 509 | Line 545 | operator {
545           * unkline        - allows UNKLINE                    | ('U' flag)
546           * gline          - allows GLINE                      | ('G' flag)
547           * xline          - allows XLINE                      | ('X' flag)
548 +         * unxline        - allows UNXLINE                    |
549           * locops         - allows LOCOPS                     |
550           * globops        - allows GLOBOPS                    |
551           * wallops        - allows WALLOPS                    |
515         * operwall       - allows OPERWALL                   | ('L' flag)
552           * rehash         - allows oper to REHASH config      | ('H' flag)
553           * die            - allows DIE                        | ('D' flag)
554           * restart        - allows RESTART                    |
# Line 520 | Line 556 | operator {
556           * admin          - gives administrator privileges    | ('A' flag)
557           */
558          flags = kill, kill:remote, connect, connect:remote, kline, unkline,
559 <                xline, globops, restart, die, rehash, admin, operwall, module;
559 >                xline, globops, restart, die, rehash, admin, module;
560   };
561  
562   /*
563 < * service {}: specifies what server may act as a network service
563 > * service {}: specifies a server which may act as a network service
564   *
565 < * NOTE: it is absolutely important that every single server on the network
565 > * NOTE: it is very important that every server on the network
566   *       has the same service{} block.
567   */
568   service {
# Line 535 | Line 571 | service {
571   };
572  
573   /*
574 < * connect {}:  controls servers we connect to
574 > * connect {}: define a server to connect to
575   */
576   connect {
577          /* name: the name of the server */
578          name = "irc.uplink.com";
579  
580          /*
581 <         * host: the host or IP to connect to. If a hostname is used it
582 <         * must match the reverse dns of the server.
581 >         * host: the host or IP address to connect to. If a hostname is used it
582 >         * must match the reverse DNS of the server.
583           */
584          host = "192.168.0.1";
585  
586          /*
587 <         * vhost: the IP to bind to when we connect outward to servers.
587 >         * vhost: the IP address to bind to when making outgoing connections to
588 >         * servers.
589           * serverinfo::vhost and serverinfo::vhost6 will be overridden
590           * by this directive.
591           */
592          vhost = "192.168.0.2";
593  
594          /*
595 <         * passwords: the passwords we send (OLD C:) and accept (OLD N:).
596 <         * The remote server will have these passwords reversed.
595 >         * passwords: the passwords to send (OLD C:) and accept (OLD N:).
596 >         * The remote server will have these passwords swapped.
597           */
598          send_password = "password";
599          accept_password = "anotherpassword";
# Line 589 | Line 626 | connect {
626           * ssl_cipher_list:
627           *
628           * List of ciphers that the server we are connecting to must support.
629 <         * If the server isn't capable of any cipher listed below, the
630 <         * connection will simply be rejected.
629 >         * If the server is not capable of using any of the ciphers listed below,
630 >         * the connection will simply be rejected.
631           * Can be used to enforce stronger ciphers, even though this option
632           * is not necessarily required to establish a SSL/TLS connection.
633           *
634           * Multiple ciphers are separated by colons. The order of preference
635           * is from left to right.
636           */
637 < #       ssl_cipher_list = "DHE-RSA-AES256-SHA:AES256-SHA";
637 > #       ssl_cipher_list = "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA:AES256-SHA";
638 >
639 >        /*
640 >         * ssl_certificate_fingerprint: enhances security by additionally checking
641 >         * the server's client certificate fingerprint against the specified
642 >         * fingerprint below.
643 >         */
644 > #       ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D";
645  
646          /*
647           * autoconn   - controls whether we autoconnect to this server or not,
# Line 628 | Line 672 | connect {
672   */
673   cluster {
674          /*
675 <         * name: the server to share with, this can take wildcards
675 >         * name: the server to share with; this can take wildcards
676           *
677 <         * NOTE: only local actions will be clustered, meaning if
677 >         * NOTE: only local actions will be clustered, meaning that if
678           *       the server receives a shared kline/unkline/etc, it
679           *       will not be propagated to clustered servers.
680           *
# Line 641 | Line 685 | cluster {
685          name = "*.arpa";
686  
687          /*
688 <         * type: list of what to share, options are as follows:
688 >         * type: list of what to share; options are as follows:
689           *      dline   - share dlines
690           *      undline - share undlines
691           *      kline   - share klines
# Line 659 | Line 703 | cluster {
703   /*
704   * shared {}: users that are allowed to remote kline
705   *
706 < * NOTE: This can be effectively used for remote klines.
706 > * NOTE: This can effectively be used for remote klines.
707   *       Please note that there is no password authentication
708   *       for users setting remote klines. You must also be
709   *       /oper'd in order to issue a remote kline.
710   */
711   shared {
712          /*
713 <         * name: the server the user must be on to set klines. If this is not
714 <         * specified, the user will be allowed to kline from all servers.
713 >         * name: the server the user must be connected to in order to set klines.
714 >         * If this is not specified, the user will be allowed to kline from all
715 >         * servers.
716           */
717          name = "irc2.some.server";
718  
# Line 704 | Line 749 | kill {
749   };
750  
751   /*
752 < * deny {}:  IPs that are not allowed to connect (before DNS/ident lookup)
752 > * deny {}:  IP addresses that are not allowed to connect
753 > * (before DNS/ident lookup)
754   * Oper issued dlines will be added to the specified dline config
755   */
756   deny {
# Line 713 | Line 759 | deny {
759   };
760  
761   /*
762 < * exempt {}:  IPs that are exempt from deny {} and Dlines
762 > * exempt {}:  IP addresses that are exempt from deny {} and Dlines
763   */
764   exempt {
765          ip = "192.168.0.0/16";
# Line 723 | Line 769 | exempt {
769   * resv {}:  nicks and channels users may not use/join
770   */
771   resv { mask = "clone*"; reason = "Clone bots"; };
772 + resv { mask = "Global"; reason = "Reserved for services"; };
773   resv { mask = "ChanServ"; reason = "Reserved for services"; };
774   resv { mask = "NickServ"; reason = "Reserved for services"; };
775   resv { mask = "OperServ"; reason = "Reserved for services"; };
# Line 736 | Line 783 | resv { mask = "#*services*"; reason = "R
783   resv {
784          /*
785           * mask: masks starting with a '#' are automatically considered
786 <         * as channel name mask.
786 >         * as channel name masks.
787           */
788          mask = "#helsinki";
789 <        reason = "Channel is reserved for finnish inhabitants";
789 >        reason = "Channel is reserved for Finnish inhabitants";
790  
791          /*
792           * exempt: can be either a ISO 3166 alpha-2 two letter country
# Line 768 | Line 815 | gecos {
815   channel {
816          /*
817           * disable_fake_channels: this option, if set to 'yes', will
818 <         * disallow clients to create or join channels that have one
818 >         * disallow clients from creating or joining channels that have one
819           * of the following ASCII characters in their name:
820           *
821           *   2 | bold
# Line 782 | Line 829 | channel {
829          disable_fake_channels = yes;
830  
831          /*
832 <         * knock_delay: The amount of time a user must wait between issuing
833 <         * the knock command.
832 >         * invite_client_count, invite_client_time: how many INVITE commands
833 >         * are permitted per client per invite_client_time.
834           */
835 <        knock_delay = 5 minutes;
835 >        invite_client_count = 10;
836 >        invite_client_time = 5 minutes;
837  
838          /*
839 <         * knock_delay_channel: How often a knock to any specific channel
840 <         * is permitted, regardless of the user sending the knock.
839 >         * knock_client_count, knock_client_time: how many KNOCK commands
840 >         * are permitted per client per knock_client_time.
841           */
842 <        knock_delay_channel = 1 minute;
842 >        knock_client_count = 1;
843 >        knock_client_time = 5 minutes;
844  
845          /*
846 <         * max_chans_per_user: The maximum number of channels a user can
847 <         * join/be on.
846 >         * knock_delay_channel: how often a KNOCK to any specific channel
847 >         * is permitted, regardless of the user sending the KNOCK.
848           */
849 <        max_chans_per_user = 25;
849 >        knock_delay_channel = 1 minute;
850  
851          /*
852 <         * max_chans_per_oper: The maximum number of channels an oper can
853 <         * join/be on.
852 >         * max_channels: the maximum number of channels a user can join/be on.
853 >         * This is a default value which can be overriden with class{} blocks.
854           */
855 <        max_chans_per_oper = 50;
855 >        max_channels = 25;
856  
857          /* max_bans: maximum number of +b/e/I modes in a channel */
858          max_bans = 100;
859  
860          /*
861 <         * how many joins in how many seconds constitute a flood, use 0 to
861 >         * how many joins in how many seconds constitute a flood. Use 0 to
862           * disable. +b opers will be notified (changeable via /set)
863           */
864          join_flood_count = 16;
865          join_flood_time = 8 seconds;
866  
867          /*
868 <         * splitcode: The ircd will now check splitmode every few seconds.
868 >         * The ircd will now check splitmode (whether a server is split from
869 >         * the network) every few seconds; this functionality is known as
870 >         * splitcode and is influenced by the options below.
871           *
872           * Either split users or split servers can activate splitmode, but
873           * both conditions must be met for the ircd to deactivate splitmode.
874 <         *
874 >         *
875           * You may force splitmode to be permanent by /quote set splitmode on
876           */
877  
# Line 836 | Line 887 | channel {
887           */
888          default_split_server_count = 0;
889  
890 <        /* no_create_on_split: disallow users creating channels on split. */
890 >        /* no_create_on_split: do not allow users to create channels on split. */
891          no_create_on_split = yes;
892  
893 <        /* no_join_on_split: disallow users joining channels at all on a split. */
893 >        /* no_join_on_split: do not allow users to join channels on a split. */
894          no_join_on_split = no;
895   };
896  
897   /*
898   * serverhide {}:  The serverhide block contains the options regarding
899 < * serverhiding
899 > * to server hiding
900   */
901   serverhide {
902          /*
903 <         * disable_remote_commands: disable users doing commands
903 >         * disable_remote_commands: disable users issuing commands
904           * on remote servers.
905           */
906          disable_remote_commands = no;
907  
908          /*
909           * flatten_links: this option will show all servers in /links appear
910 <         * that they are linked to this current server.
910 >         * as though they are linked to this current server.
911           */
912          flatten_links = no;
913  
# Line 891 | Line 942 | serverhide {
942  
943          /*
944           * hide_server_ips: If this is disabled, opers will be unable to see
945 <         * servers ips and will be shown a masked ip, admins will be shown the
946 <         * real ip.
945 >         * servers' IP addresses and will be shown a masked IP address; admins
946 >         * will be shown the real IP address.
947           *
948 <         * If this is enabled, nobody can see a servers ip. *This is a kludge*,
949 <         * it has the side effect of hiding the ips everywhere, including
950 <         * logfiles.
948 >         * If this is enabled, nobody can see a server's IP address.
949 >         * *This is a kludge*: it has the side effect of hiding the IP addresses
950 >         * everywhere, including logfiles.
951           *
952           * We recommend you leave this disabled, and just take care with who you
953           * give administrator privileges to.
# Line 909 | Line 960 | serverhide {
960   * compiled in options in config.h
961   */
962   general {
963 +        /*
964 +         * cycle_on_host_change: sends a fake QUIT/JOIN combination
965 +         * when services change the hostname of a specific client.
966 +         */
967 +        cycle_on_host_change = yes;
968 +
969          /* services_name: servername of nick/channel services */
970          services_name = "service.someserver";
971  
972          /* max_watch: maximum WATCH entries a client can have. */
973 <        max_watch = 60;
973 >        max_watch = 30;
974 >
975 >        /* max_accept: maximum allowed /accept's for +g usermode. */
976 >        max_accept = 30;
977  
978 <        /* gline_enable: enable glines, network wide temp klines. */
978 >        /* gline_enable: enable glines (network-wide temporary klines). */
979          gline_enable = yes;
980  
981          /*
# Line 943 | Line 1003 | general {
1003          gline_min_cidr6 = 48;
1004  
1005          /*
1006 <         * Whether to automatically set mode +i on connecting users.
1006 >         * invisible_on_connect: whether to automatically set mode +i on
1007 >         * connecting users.
1008           */
1009          invisible_on_connect = yes;
1010  
1011          /*
1012 <         * kill_chase_time_limit: maximum time from the nickname change that
1013 <         * still causes KILL automatically to switch for the current nick of
1014 <         * that user.
1012 >         * kill_chase_time_limit: KILL chasing is a feature whereby a KILL
1013 >         * issued for a user who has recently changed nickname will be applied
1014 >         * automatically to the new nick. kill_chase_time_limit is the maximum
1015 >         * time following a nickname change that this chasing will apply.
1016           */
1017 <        kill_chase_time_limit = 90 seconds;
1017 >        kill_chase_time_limit = 30 seconds;
1018  
1019          /*
1020           * hide_spoof_ips: if disabled, opers will be allowed to see the real
1021 <         * IP of spoofed users in /trace etc. If this is defined they will be
1022 <         * shown a masked IP.
1021 >         * IP address of spoofed users in /trace etc. If this is defined they
1022 >         * will be shown a masked IP.
1023           */
1024          hide_spoof_ips = yes;
1025  
# Line 983 | Line 1045 | general {
1045  
1046          /*
1047           * default_floodcount: the default value of floodcount that is configurable
1048 <         * via /quote set floodcount. This is the amount of lines a user
1048 >         * via /quote set floodcount. This is the number of lines a user
1049           * may send to any other user/channel in one second.
1050           */
1051          default_floodcount = 10;
1052  
1053          /*
1054 <         * failed_oper_notice: send a notice to all opers on the server when
1054 >         * failed_oper_notice: send a notice to all opers on the server when
1055           * someone tries to OPER and uses the wrong password, host or ident.
1056           */
1057          failed_oper_notice = yes;
1058  
1059          /*
1060 <         * dots_in_ident: the amount of '.' characters permitted in an ident
1060 >         * dots_in_ident: the number of '.' characters permitted in an ident
1061           * reply before the user is rejected.
1062           */
1063          dots_in_ident = 2;
1064  
1065          /*
1066 <         * min_nonwildcard: the minimum non wildcard characters in k/d/g lines
1067 <         * placed via the server. K-lines hand placed are exempt from limits.
1066 >         * min_nonwildcard: the minimum number of non-wildcard characters in
1067 >         * k/d/g lines placed via the server. K-lines hand-placed are exempt from
1068 >         * this limit.
1069           * Wildcard chars: '.', ':', '*', '?', '@', '!'
1070           */
1071          min_nonwildcard = 4;
1072  
1073          /*
1074 <         * min_nonwildcard_simple: the minimum non wildcard characters in
1075 <         * gecos bans. Wildcard chars: '*', '?'
1074 >         * min_nonwildcard_simple: the minimum number of non-wildcard characters
1075 >         * in gecos bans. Wildcard chars: '*', '?'
1076           */
1077          min_nonwildcard_simple = 3;
1078  
1016        /* max_accept: maximum allowed /accept's for +g usermode. */
1017        max_accept = 20;
1018
1079          /* anti_nick_flood: enable the nickflood control code. */
1080          anti_nick_flood = yes;
1081  
1082 <        /* nick flood: the nick changes allowed in the specified period */
1082 >        /* nick flood: the number of nick changes allowed in the specified period */
1083          max_nick_time = 20 seconds;
1084          max_nick_changes = 5;
1085  
# Line 1030 | Line 1090 | general {
1090          anti_spam_exit_message_time = 5 minutes;
1091  
1092          /*
1093 <         * ts delta: the time delta allowed between server clocks before
1094 <         * a warning is given, or before the link is dropped. All servers
1095 <         * should run ntpdate/rdate to keep clocks in sync
1093 >         * ts_warn_delta, ts_max_delta: the time delta allowed between server
1094 >         * clocks before a warning is given, or before the link is dropped.
1095 >         * All servers should run ntpdate/rdate to keep clocks in sync
1096           */
1097 <        ts_warn_delta = 30 seconds;
1098 <        ts_max_delta = 5 minutes;
1097 >        ts_warn_delta = 10 seconds;
1098 >        ts_max_delta = 2 minutes;
1099  
1100          /*
1101 <         * warn_no_nline: warn opers about servers that try to connect but
1102 <         * we don't have a connect {} block for. Twits with misconfigured
1103 <         * servers can get really annoying with this enabled.
1101 >         * warn_no_connect_block: warn opers about servers that try to connect
1102 >         * but for which we don't have a connect {} block. Twits with
1103 >         * misconfigured servers can become really annoying with this enabled.
1104           */
1105 <        warn_no_nline = yes;
1105 >        warn_no_connect_block = yes;
1106  
1107          /*
1108           * stats_e_disabled: set this to 'yes' to disable "STATS e" for both
# Line 1052 | Line 1112 | general {
1112           */
1113          stats_e_disabled = no;
1114  
1115 <        /* stats_o_oper only: make stats o (opers) oper only */
1115 >        /* stats_o_oper_only: make stats o (opers) oper only */
1116          stats_o_oper_only = yes;
1117  
1118          /* stats_P_oper_only: make stats P (ports) oper only */
1119          stats_P_oper_only = yes;
1120  
1121 +        /* stats_u_oper_only: make stats u (uptime) oper only */
1122 +        stats_u_oper_only = no;
1123 +
1124          /*
1125 <         * stats i oper only: make stats i (auth {}) oper only. Set to:
1125 >         * stats_i_oper_only: make stats i (auth {}) oper only. Set to:
1126           *     yes    - show users no auth blocks, made oper only.
1127 <         *     masked - show users first matching auth block
1127 >         *     masked - show users the first matching auth block
1128           *     no     - show users all auth blocks.
1129           */
1130          stats_i_oper_only = yes;
# Line 1069 | Line 1132 | general {
1132          /*
1133           * stats_k_oper_only: make stats k/K (klines) oper only. Set to:
1134           *     yes    - show users no auth blocks, made oper only
1135 <         *     masked - show users first matching auth block
1135 >         *     masked - show users the first matching auth block
1136           *     no     - show users all auth blocks.
1137           */
1138          stats_k_oper_only = yes;
# Line 1087 | Line 1150 | general {
1150          opers_bypass_callerid = no;
1151  
1152          /*
1153 <         * pace_wait_simple: time between use of less intensive commands
1154 <         * (ADMIN, HELP, (L)USERS, VERSION, remote WHOIS)
1153 >         * pace_wait_simple: minimum time required between use of less
1154 >         * intensive commands
1155 >         * (ADMIN, HELP, LUSERS, VERSION, remote WHOIS)
1156           */
1157          pace_wait_simple = 1 second;
1158  
1159          /*
1160 <         * pace_wait: time between more intensive commands
1161 <         * (AWAY, INFO, LINKS, MAP, MOTD, STATS, WHO, wildcard WHOIS, WHOWAS)
1160 >         * pace_wait: minimum time required between use of more intensive commands
1161 >         * (AWAY, INFO, LINKS, MAP, MOTD, STATS, WHO, WHOWAS)
1162           */
1163          pace_wait = 10 seconds;
1164  
1165          /*
1166 <         * short_motd: send clients a notice telling them to read the motd
1167 <         * instead of forcing a motd to clients who may simply ignore it.
1166 >         * short_motd: send clients a notice telling them to read the MOTD
1167 >         * instead of forcing an MOTD to clients who may simply ignore it.
1168           */
1169          short_motd = no;
1170  
# Line 1122 | Line 1186 | general {
1186          /* oper_pass_resv: allow opers to over-ride RESVs on nicks/channels. */
1187          oper_pass_resv = yes;
1188  
1189 <        /* REMOVE ME.  The following line checks you've been reading. */
1189 >        /* REMOVE ME. The following line checks that you have been reading. */
1190          havent_read_conf = 1;
1191  
1192          /*
1193 <         * max_targets: the maximum amount of targets in a single
1193 >         * max_targets: the maximum number of targets in a single
1194           * PRIVMSG/NOTICE. Set to 999 NOT 0 for unlimited.
1195           */
1196          max_targets = 4;
# Line 1144 | Line 1208 | general {
1208           * +G - softcallerid - Server Side Ignore for users not on your channels
1209           * +g - callerid     - Server Side Ignore (for privmsgs etc)
1210           * +H - hidden       - Hides operator status to other users
1211 <         * +i - invisible    - Not shown in NAMES or WHO unless you share a
1148 <         *                     a channel
1211 >         * +i - invisible    - Not shown in NAMES or WHO unless you share a channel
1212           * +j - rej          - See rejected client notices
1213           * +k - skill        - See server generated KILL messages
1214           * +l - locops       - See LOCOPS messages
1215           * +n - nchange      - See client nick changes
1216 +         * +p - hidechans    - Hides channel list in WHOIS
1217 +         * +q - hideidle     - Hides idle and signon time in WHOIS
1218           * +R - nononreg     - Only receive private messages from registered clients
1219           * +s - servnotice   - See general server notices
1220           * +u - unauth       - See unauthorized client notices
1221           * +w - wallop       - See server generated WALLOPS
1222           * +y - spy          - See LINKS, STATS, TRACE notices etc.
1158         * +z - operwall     - See oper generated WALLOPS
1223           */
1224  
1225          /* oper_only_umodes: usermodes only opers may set */
1226          oper_only_umodes = bots, cconn, debug, full, hidden, skill,
1227 <                           nchange, rej, spy, external, operwall,
1228 <                           locops, unauth, farconnect;
1227 >                        nchange, rej, spy, external,
1228 >                        locops, unauth, farconnect;
1229  
1230          /* oper_umodes: default usermodes opers get when they /oper */
1231 <        oper_umodes = bots, locops, servnotice, operwall, wallop;
1231 >        oper_umodes = bots, locops, servnotice, wallop;
1232  
1233          /*
1234           * use_egd: if your system does not have *random devices yet you
# Line 1179 | Line 1243 | general {
1243           */
1244   #       egdpool_path = "/var/run/egd-pool";
1245  
1246 +
1247          /*
1248 <         * throttle_time: the minimum amount of time between connections from
1249 <         * the same ip. exempt {} blocks are excluded from this throttling.
1248 >         * throttle_count: the maximum number of connections from the same
1249 >         * IP address allowed in throttle_time duration.
1250 >         */
1251 >        throttle_count = 1;
1252 >
1253 >        /*
1254 >         * throttle_time: the minimum amount of time required between
1255 >         * connections from the same IP address. exempt {} blocks are
1256 >         * excluded from this throttling.
1257           * Offers protection against flooders who reconnect quickly.
1258           * Set to 0 to disable.
1259           */
1260 <        throttle_time = 10;
1260 >        throttle_time = 2 seconds;
1261   };
1262  
1263   modules {
# Line 1243 | Line 1315 | log {
1315                  size = 50 megabytes;
1316          };
1317  
1318 +        file {
1319 +                type = xline;
1320 +                name = "/usr/local/ircd/var/log/xline.log";
1321 +                size = 50 megabytes;
1322 +        };
1323 +
1324 +        file {
1325 +                type = resv;
1326 +                name = "/usr/local/ircd/var/log/resv.log";
1327 +                size = 50 megabytes;
1328 +        };
1329 +
1330          file {
1331                  type = debug;
1332                  name = "/usr/local/ircd/var/log/debug.log";

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)