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 4070 by michael, Thu Jun 26 15:36:08 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:
# Line 205 | Line 214 | class {
214  
215          /*
216           * number_per_ip: how many local users are allowed to connect
217 <         * from one IP  (optional)
217 >         * from a single IP address  (optional)
218           */
219          number_per_ip = 2;
220  
221          /*
222           * max_local: how many local users are allowed to connect
223 <         * from one ident@host  (optional)
223 >         * from a single ident@host  (optional)
224           */
225          max_local = 2;
226  
# Line 234 | Line 243 | class {
243          number_per_cidr = 16;
244  
245          /*
246 <         * sendq: the amount of data allowed in a clients send queue before
246 >         * sendq: the amount of data allowed in a client's send queue before
247           * they are dropped.
248           */
249          sendq = 100 kbytes;
250  
251          /*
252 <         * recvq: maximum amount of data in a clients receive queue before
252 >         * recvq: the amount of data allowed in a client's receive queue before
253           * they are dropped for flooding. Defaults to 2560 if the chosen
254           * value isn't within the range of 512 to 8000.
255           */
# Line 254 | Line 263 | class {
263          max_number = 100;
264          sendq = 100 kbytes;
265  
266 +
267 +        /*
268 +         * max_channels: maximum number of channels users in this class can join.
269 +         */
270 +        max_channels = 60;
271 +
272          /*
273           * min_idle: minimum idle time that is shown in /whois.
274           */
# Line 267 | Line 282 | class {
282          /*
283           * flags:
284           *
285 <         * random_idle          - idle time is randomly selected within the
286 <         *                        range of min_idle to max_idle
287 <         * hide_idle_from_opers - fake idle time will be shown to operators, too
285 >         * random_idle          - a fake idle time is set randomly between
286 >         *                        min_idle and max_idle
287 >         * hide_idle_from_opers - the fake idle time will also be shown to operators
288           */
289          flags = random_idle, hide_idle_from_opers;
290   };
# Line 284 | Line 299 | class {
299           */
300          connectfreq = 5 minutes;
301  
302 <        /* max number: the amount of servers to autoconnect to. */
302 >        /* max number: the number of servers to autoconnect to. */
303          max_number = 1;
304  
305          /* sendq: servers need a higher sendq as they send more data. */
# Line 292 | Line 307 | class {
307   };
308  
309   /*
310 < * motd {}: Allows to show a different MOTD to a client
310 > * motd {}: Allows the display of a different MOTD to a client
311   * depending on its origin. Applies to local users only.
312   */
313   motd {
314          /*
315           * mask: multiple mask entries are permitted. Mask can either be
316 <         * a class name or a hostname.
316 >         * a class name or a hostname. CIDR is supported.
317           */
318          mask = "*.at";
319          mask = "*.de";
# Line 315 | Line 330 | motd {
330   */
331   listen {
332          /*
333 <         * port: the specific port to listen on. If no host is specified
334 <         * before, it will listen on all available IPs.
333 >         * port: the port to listen on. If no host is specified earlier
334 >         * in the listen {} block, it will listen on all available IPs.
335           *
336 <         * Ports are separated via a comma, a range may be specified using ".."
336 >         * Ports are separated by commas; a range may be specified using ".."
337           */
338 <        
339 <        /* port: listen on all available IPs, ports 6665 to 6669 */
338 >
339 >        /* port: listen on all available IP addresses, ports 6665 to 6669 */
340          port = 6665 .. 6669;
341  
342          /*
343 <         * Listen on 192.168.0.1/6697 with ssl enabled and hidden from STATS P
343 >         * Listen on 192.168.0.1/6697 with SSL enabled and hidden from STATS P
344           * unless you are an administrator.
345           *
346 <         * NOTE: The "flags" directive has to come before "port". Always!
346 >         * NOTE: The "flags" directive always has to come before "port".
347           *
348           * Currently available flags are:
349           *
# Line 341 | Line 356 | listen {
356          port = 6697;
357  
358          /*
359 <         * host: set a specific IP/host the ports after the line will listen
360 <         * on. This may be ipv4 or ipv6.
359 >         * host: set a specific IP address/host to listen on using the
360 >         * subsequent port definitions. This may be IPv4 or IPv6.
361           */
362          host = "1.2.3.4";
363          port = 7000, 7001;
# Line 357 | Line 372 | listen {
372   auth {
373          /*
374           * user: the user@host allowed to connect. Multiple user
375 <         * lines are permitted per auth block.
375 >         * lines are permitted within each auth block.
376           */
377          user = "*@172.16.0.0/12";
378          user = "*test@123D:B567:*";
# Line 372 | Line 387 | auth {
387          encrypted = yes;
388  
389          /*
390 <         * spoof: fake the users host to this. This is free-form, just do
390 >         * spoof: fake the user's host to this. This is free-form, just do
391           * everyone a favor and don't abuse it. ('=' prefix on /stats I)
392           */
393          spoof = "I.still.hate.packets";
# Line 402 | Line 417 | auth {
417   auth {
418          /*
419           * redirect: the server and port to redirect a user to. A user does not
420 <         * have to obey the redirection, the ircd just suggests an alternative
420 >         * have to obey the redirection; the ircd just suggests an alternative
421           * server for them.
422           */
423          redirserv = "this.is.not.a.real.server";
424          redirport = 6667;
425 <        
425 >
426          user = "*.server";
427  
428          /* class: a class is required even though it is not used */
# Line 428 | Line 443 | operator {
443          name = "sheep";
444  
445          /*
446 <         * user: the user@host required for this operator. Multiple
447 <         * user="" lines are supported.
446 >         * user: the user@host required for this operator. Multiple user
447 >         * lines are permitted within each operator block.
448           */
449          user = "*sheep@192.168.0.0/16";
450          user = "*@127.0.0.0/8";
# Line 439 | Line 454 | operator {
454           * need to be encrypted by using the provided mkpasswd tool.
455           * Several password hash algorithms are available depending
456           * on your system's crypt() implementation. For example, a modern
457 <         * glibc already has support for SHA-256/512, and MD5 encryption
457 >         * glibc already has support for the SHA-256/512 and MD5 encryption
458           * algorithms.
459           */
460          password = "$5$x5zof8qe.Yc7/bPp$5zIg1Le2Lsgd4CvOjaD20pr5PmcfD7ha/9b2.TaUyG4";
# Line 452 | Line 467 | operator {
467  
468          /*
469           * rsa_public_key_file: the public key for this oper when using Challenge.
470 <         * A password should not be defined when this is used, see
470 >         * A password should not be defined when this is used; see
471           * doc/challenge.txt for more information.
472           */
473   #       rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
474  
475 +        /*
476 +         * ssl_certificate_fingerprint: enhances security by additionally checking
477 +         * the oper's client certificate fingerprint against the specified
478 +         * fingerprint below.
479 +         *
480 +         * Hint: your users can use the following command to obtain a SHA-256 hash
481 +         * of their ssl certificate:
482 +         *
483 +         *      openssl x509 -sha256 -noout -fingerprint -in cert.pem | sed -e 's/^.*=//;s/://g'
484 +         */
485 + #       ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D";
486 +
487 +        /*
488 +         * ssl_connection_required: client must be connected over SSL/TLS
489 +         * in order to be able to use this oper{} block.
490 +         * Default is 'no' if nothing else is specified.
491 +         */
492 +        ssl_connection_required = no;
493 +
494          /* class: the class the oper joins when they successfully /oper */
495          class = "opers";
496  
497          /*
498 <         * umodes: default usermodes opers get when they /oper. If defined,
498 >         * umodes: the default usermodes opers get when they /oper. If defined,
499           * it will override oper_umodes settings in general {}.
500           * Available usermodes:
501           *
# Line 475 | Line 509 | operator {
509           * +G - softcallerid - Server Side Ignore for users not on your channels
510           * +g - callerid     - Server Side Ignore (for privmsgs etc)
511           * +H - hidden       - Hides operator status to other users
512 <         * +i - invisible    - Not shown in NAMES or WHO unless you share a
479 <         *                     a channel
512 >         * +i - invisible    - Not shown in NAMES or WHO unless you share a channel
513           * +j - rej          - See rejected client notices
514           * +k - skill        - See server generated KILL messages
515           * +l - locops       - See LOCOPS messages
516           * +n - nchange      - See client nick changes
517 +         * +p - hidechans    - Hides channel list in WHOIS
518 +         * +q - hideidle     - Hides idle and signon time in WHOIS
519           * +R - nononreg     - Only receive private messages from registered clients
520           * +s - servnotice   - See general server notices
521           * +u - unauth       - See unauthorized client notices
522           * +w - wallop       - See server generated WALLOPS
523           * +y - spy          - See LINKS, STATS, TRACE notices etc.
489         * +z - operwall     - See oper generated WALLOPS
524           */
525 <        umodes = locops, servnotice, operwall, wallop;
525 >        umodes = locops, servnotice, wallop;
526  
527          /*
528 <         * privileges: controls the activities and commands an oper is
528 >         * privileges: controls the activities and commands an oper is
529           * allowed to do on the server. All options default to no.
530           * Available options:
531           *
# Line 509 | Line 543 | operator {
543           * unkline        - allows UNKLINE                    | ('U' flag)
544           * gline          - allows GLINE                      | ('G' flag)
545           * xline          - allows XLINE                      | ('X' flag)
546 +         * unxline        - allows UNXLINE                    |
547           * locops         - allows LOCOPS                     |
548           * globops        - allows GLOBOPS                    |
549           * wallops        - allows WALLOPS                    |
515         * operwall       - allows OPERWALL                   | ('L' flag)
550           * rehash         - allows oper to REHASH config      | ('H' flag)
551           * die            - allows DIE                        | ('D' flag)
552           * restart        - allows RESTART                    |
# Line 520 | Line 554 | operator {
554           * admin          - gives administrator privileges    | ('A' flag)
555           */
556          flags = kill, kill:remote, connect, connect:remote, kline, unkline,
557 <                xline, globops, restart, die, rehash, admin, operwall, module;
557 >                xline, globops, restart, die, rehash, admin, module;
558   };
559  
560   /*
561 < * service {}: specifies what server may act as a network service
561 > * service {}: specifies a server which may act as a network service
562   *
563 < * NOTE: it is absolutely important that every single server on the network
563 > * NOTE: it is very important that every server on the network
564   *       has the same service{} block.
565   */
566   service {
# Line 535 | Line 569 | service {
569   };
570  
571   /*
572 < * connect {}:  controls servers we connect to
572 > * connect {}: define a server to connect to
573   */
574   connect {
575          /* name: the name of the server */
576          name = "irc.uplink.com";
577  
578          /*
579 <         * host: the host or IP to connect to. If a hostname is used it
580 <         * must match the reverse dns of the server.
579 >         * host: the host or IP address to connect to. If a hostname is used it
580 >         * must match the reverse DNS of the server.
581           */
582          host = "192.168.0.1";
583  
584          /*
585 <         * vhost: the IP to bind to when we connect outward to servers.
585 >         * vhost: the IP address to bind to when making outgoing connections to
586 >         * servers.
587           * serverinfo::vhost and serverinfo::vhost6 will be overridden
588           * by this directive.
589           */
590          vhost = "192.168.0.2";
591  
592          /*
593 <         * passwords: the passwords we send (OLD C:) and accept (OLD N:).
594 <         * The remote server will have these passwords reversed.
593 >         * passwords: the passwords to send (OLD C:) and accept (OLD N:).
594 >         * The remote server will have these passwords swapped.
595           */
596          send_password = "password";
597          accept_password = "anotherpassword";
# Line 589 | Line 624 | connect {
624           * ssl_cipher_list:
625           *
626           * List of ciphers that the server we are connecting to must support.
627 <         * If the server isn't capable of any cipher listed below, the
628 <         * connection will simply be rejected.
627 >         * If the server is not capable of using any of the ciphers listed below,
628 >         * the connection will simply be rejected.
629           * Can be used to enforce stronger ciphers, even though this option
630           * is not necessarily required to establish a SSL/TLS connection.
631           *
632           * Multiple ciphers are separated by colons. The order of preference
633           * is from left to right.
634           */
635 < #       ssl_cipher_list = "DHE-RSA-AES256-SHA:AES256-SHA";
635 > #       ssl_cipher_list = "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA:AES256-SHA";
636 >
637 >        /*
638 >         * ssl_certificate_fingerprint: enhances security by additionally checking
639 >         * the server's client certificate fingerprint against the specified
640 >         * fingerprint below.
641 >         */
642 > #       ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D";
643  
644          /*
645           * autoconn   - controls whether we autoconnect to this server or not,
# Line 628 | Line 670 | connect {
670   */
671   cluster {
672          /*
673 <         * name: the server to share with, this can take wildcards
673 >         * name: the server to share with; this can take wildcards
674           *
675 <         * NOTE: only local actions will be clustered, meaning if
675 >         * NOTE: only local actions will be clustered, meaning that if
676           *       the server receives a shared kline/unkline/etc, it
677           *       will not be propagated to clustered servers.
678           *
# Line 641 | Line 683 | cluster {
683          name = "*.arpa";
684  
685          /*
686 <         * type: list of what to share, options are as follows:
686 >         * type: list of what to share; options are as follows:
687           *      dline   - share dlines
688           *      undline - share undlines
689           *      kline   - share klines
# Line 659 | Line 701 | cluster {
701   /*
702   * shared {}: users that are allowed to remote kline
703   *
704 < * NOTE: This can be effectively used for remote klines.
704 > * NOTE: This can effectively be used for remote klines.
705   *       Please note that there is no password authentication
706   *       for users setting remote klines. You must also be
707   *       /oper'd in order to issue a remote kline.
708   */
709   shared {
710          /*
711 <         * name: the server the user must be on to set klines. If this is not
712 <         * specified, the user will be allowed to kline from all servers.
711 >         * name: the server the user must be connected to in order to set klines.
712 >         * If this is not specified, the user will be allowed to kline from all
713 >         * servers.
714           */
715          name = "irc2.some.server";
716  
# Line 704 | Line 747 | kill {
747   };
748  
749   /*
750 < * deny {}:  IPs that are not allowed to connect (before DNS/ident lookup)
750 > * deny {}:  IP addresses that are not allowed to connect
751 > * (before DNS/ident lookup)
752   * Oper issued dlines will be added to the specified dline config
753   */
754   deny {
# Line 713 | Line 757 | deny {
757   };
758  
759   /*
760 < * exempt {}:  IPs that are exempt from deny {} and Dlines
760 > * exempt {}:  IP addresses that are exempt from deny {} and Dlines
761   */
762   exempt {
763          ip = "192.168.0.0/16";
# Line 723 | Line 767 | exempt {
767   * resv {}:  nicks and channels users may not use/join
768   */
769   resv { mask = "clone*"; reason = "Clone bots"; };
770 + resv { mask = "Global"; reason = "Reserved for services"; };
771   resv { mask = "ChanServ"; reason = "Reserved for services"; };
772   resv { mask = "NickServ"; reason = "Reserved for services"; };
773   resv { mask = "OperServ"; reason = "Reserved for services"; };
# Line 736 | Line 781 | resv { mask = "#*services*"; reason = "R
781   resv {
782          /*
783           * mask: masks starting with a '#' are automatically considered
784 <         * as channel name mask.
784 >         * as channel name masks.
785           */
786          mask = "#helsinki";
787 <        reason = "Channel is reserved for finnish inhabitants";
787 >        reason = "Channel is reserved for Finnish inhabitants";
788  
789          /*
790           * exempt: can be either a ISO 3166 alpha-2 two letter country
# Line 768 | Line 813 | gecos {
813   channel {
814          /*
815           * disable_fake_channels: this option, if set to 'yes', will
816 <         * disallow clients to create or join channels that have one
816 >         * disallow clients from creating or joining channels that have one
817           * of the following ASCII characters in their name:
818           *
819           *   2 | bold
# Line 782 | Line 827 | channel {
827          disable_fake_channels = yes;
828  
829          /*
830 <         * knock_delay: The amount of time a user must wait between issuing
831 <         * the knock command.
830 >         * invite_client_count, invite_client_time: how many INVITE commands
831 >         * are permitted per client per invite_client_time.
832           */
833 <        knock_delay = 5 minutes;
833 >        invite_client_count = 10;
834 >        invite_client_time = 5 minutes;
835  
836          /*
837 <         * knock_delay_channel: How often a knock to any specific channel
838 <         * is permitted, regardless of the user sending the knock.
837 >         * knock_client_count, knock_client_time: how many KNOCK commands
838 >         * are permitted per client per knock_client_time.
839           */
840 <        knock_delay_channel = 1 minute;
840 >        knock_client_count = 1;
841 >        knock_client_time = 5 minutes;
842  
843          /*
844 <         * max_chans_per_user: The maximum number of channels a user can
845 <         * join/be on.
844 >         * knock_delay_channel: how often a KNOCK to any specific channel
845 >         * is permitted, regardless of the user sending the KNOCK.
846           */
847 <        max_chans_per_user = 25;
847 >        knock_delay_channel = 1 minute;
848  
849          /*
850 <         * max_chans_per_oper: The maximum number of channels an oper can
851 <         * join/be on.
850 >         * max_channels: the maximum number of channels a user can join/be on.
851 >         * This is a default value which can be overriden with class{} blocks.
852           */
853 <        max_chans_per_oper = 50;
853 >        max_channels = 25;
854  
855          /* max_bans: maximum number of +b/e/I modes in a channel */
856          max_bans = 100;
857  
858          /*
859 <         * how many joins in how many seconds constitute a flood, use 0 to
859 >         * how many joins in how many seconds constitute a flood. Use 0 to
860           * disable. +b opers will be notified (changeable via /set)
861           */
862          join_flood_count = 16;
863          join_flood_time = 8 seconds;
864  
865          /*
866 <         * splitcode: The ircd will now check splitmode every few seconds.
866 >         * The ircd will now check splitmode (whether a server is split from
867 >         * the network) every few seconds; this functionality is known as
868 >         * splitcode and is influenced by the options below.
869           *
870           * Either split users or split servers can activate splitmode, but
871           * both conditions must be met for the ircd to deactivate splitmode.
872 <         *
872 >         *
873           * You may force splitmode to be permanent by /quote set splitmode on
874           */
875  
# Line 836 | Line 885 | channel {
885           */
886          default_split_server_count = 0;
887  
888 <        /* no_create_on_split: disallow users creating channels on split. */
888 >        /* no_create_on_split: do not allow users to create channels on split. */
889          no_create_on_split = yes;
890  
891 <        /* no_join_on_split: disallow users joining channels at all on a split. */
891 >        /* no_join_on_split: do not allow users to join channels on a split. */
892          no_join_on_split = no;
893   };
894  
895   /*
896   * serverhide {}:  The serverhide block contains the options regarding
897 < * serverhiding
897 > * to server hiding
898   */
899   serverhide {
900          /*
901 <         * disable_remote_commands: disable users doing commands
901 >         * disable_remote_commands: disable users issuing commands
902           * on remote servers.
903           */
904          disable_remote_commands = no;
905  
906          /*
907           * flatten_links: this option will show all servers in /links appear
908 <         * that they are linked to this current server.
908 >         * as though they are linked to this current server.
909           */
910          flatten_links = no;
911  
# Line 891 | Line 940 | serverhide {
940  
941          /*
942           * hide_server_ips: If this is disabled, opers will be unable to see
943 <         * servers ips and will be shown a masked ip, admins will be shown the
944 <         * real ip.
943 >         * servers' IP addresses and will be shown a masked IP address; admins
944 >         * will be shown the real IP address.
945           *
946 <         * If this is enabled, nobody can see a servers ip. *This is a kludge*,
947 <         * it has the side effect of hiding the ips everywhere, including
948 <         * logfiles.
946 >         * If this is enabled, nobody can see a server's IP address.
947 >         * *This is a kludge*: it has the side effect of hiding the IP addresses
948 >         * everywhere, including logfiles.
949           *
950           * We recommend you leave this disabled, and just take care with who you
951           * give administrator privileges to.
# Line 909 | Line 958 | serverhide {
958   * compiled in options in config.h
959   */
960   general {
961 +        /*
962 +         * cycle_on_host_change: sends a fake QUIT/JOIN combination
963 +         * when services change the hostname of a specific client.
964 +         */
965 +        cycle_on_host_change = yes;
966 +
967          /* services_name: servername of nick/channel services */
968          services_name = "service.someserver";
969  
970          /* max_watch: maximum WATCH entries a client can have. */
971 <        max_watch = 60;
971 >        max_watch = 30;
972 >
973 >        /* max_accept: maximum allowed /accept's for +g usermode. */
974 >        max_accept = 30;
975  
976 <        /* gline_enable: enable glines, network wide temp klines. */
976 >        /* gline_enable: enable glines (network-wide temporary klines). */
977          gline_enable = yes;
978  
979          /*
# Line 943 | Line 1001 | general {
1001          gline_min_cidr6 = 48;
1002  
1003          /*
1004 <         * Whether to automatically set mode +i on connecting users.
1004 >         * invisible_on_connect: whether to automatically set mode +i on
1005 >         * connecting users.
1006           */
1007          invisible_on_connect = yes;
1008  
1009          /*
1010 <         * kill_chase_time_limit: maximum time from the nickname change that
1011 <         * still causes KILL automatically to switch for the current nick of
1012 <         * that user.
1010 >         * kill_chase_time_limit: KILL chasing is a feature whereby a KILL
1011 >         * issued for a user who has recently changed nickname will be applied
1012 >         * automatically to the new nick. kill_chase_time_limit is the maximum
1013 >         * time following a nickname change that this chasing will apply.
1014           */
1015 <        kill_chase_time_limit = 90 seconds;
1015 >        kill_chase_time_limit = 30 seconds;
1016  
1017          /*
1018           * hide_spoof_ips: if disabled, opers will be allowed to see the real
1019 <         * IP of spoofed users in /trace etc. If this is defined they will be
1020 <         * shown a masked IP.
1019 >         * IP address of spoofed users in /trace etc. If this is defined they
1020 >         * will be shown a masked IP.
1021           */
1022          hide_spoof_ips = yes;
1023  
# Line 983 | Line 1043 | general {
1043  
1044          /*
1045           * default_floodcount: the default value of floodcount that is configurable
1046 <         * via /quote set floodcount. This is the amount of lines a user
1046 >         * via /quote set floodcount. This is the number of lines a user
1047           * may send to any other user/channel in one second.
1048           */
1049          default_floodcount = 10;
1050  
1051          /*
1052 <         * failed_oper_notice: send a notice to all opers on the server when
1052 >         * failed_oper_notice: send a notice to all opers on the server when
1053           * someone tries to OPER and uses the wrong password, host or ident.
1054           */
1055          failed_oper_notice = yes;
1056  
1057          /*
1058 <         * dots_in_ident: the amount of '.' characters permitted in an ident
1058 >         * dots_in_ident: the number of '.' characters permitted in an ident
1059           * reply before the user is rejected.
1060           */
1061          dots_in_ident = 2;
1062  
1063          /*
1064 <         * min_nonwildcard: the minimum non wildcard characters in k/d/g lines
1065 <         * placed via the server. K-lines hand placed are exempt from limits.
1064 >         * min_nonwildcard: the minimum number of non-wildcard characters in
1065 >         * k/d/g lines placed via the server. K-lines hand-placed are exempt from
1066 >         * this limit.
1067           * Wildcard chars: '.', ':', '*', '?', '@', '!'
1068           */
1069          min_nonwildcard = 4;
1070  
1071          /*
1072 <         * min_nonwildcard_simple: the minimum non wildcard characters in
1073 <         * gecos bans. Wildcard chars: '*', '?'
1072 >         * min_nonwildcard_simple: the minimum number of non-wildcard characters
1073 >         * in gecos bans. Wildcard chars: '*', '?'
1074           */
1075          min_nonwildcard_simple = 3;
1076  
1016        /* max_accept: maximum allowed /accept's for +g usermode. */
1017        max_accept = 20;
1018
1077          /* anti_nick_flood: enable the nickflood control code. */
1078          anti_nick_flood = yes;
1079  
1080 <        /* nick flood: the nick changes allowed in the specified period */
1080 >        /* nick flood: the number of nick changes allowed in the specified period */
1081          max_nick_time = 20 seconds;
1082          max_nick_changes = 5;
1083  
# Line 1030 | Line 1088 | general {
1088          anti_spam_exit_message_time = 5 minutes;
1089  
1090          /*
1091 <         * ts delta: the time delta allowed between server clocks before
1092 <         * a warning is given, or before the link is dropped. All servers
1093 <         * should run ntpdate/rdate to keep clocks in sync
1091 >         * ts_warn_delta, ts_max_delta: the time delta allowed between server
1092 >         * clocks before a warning is given, or before the link is dropped.
1093 >         * All servers should run ntpdate/rdate to keep clocks in sync
1094           */
1095 <        ts_warn_delta = 30 seconds;
1096 <        ts_max_delta = 5 minutes;
1095 >        ts_warn_delta = 10 seconds;
1096 >        ts_max_delta = 2 minutes;
1097  
1098          /*
1099 <         * warn_no_nline: warn opers about servers that try to connect but
1100 <         * we don't have a connect {} block for. Twits with misconfigured
1101 <         * servers can get really annoying with this enabled.
1099 >         * warn_no_connect_block: warn opers about servers that try to connect
1100 >         * but for which we don't have a connect {} block. Twits with
1101 >         * misconfigured servers can become really annoying with this enabled.
1102           */
1103 <        warn_no_nline = yes;
1103 >        warn_no_connect_block = yes;
1104  
1105          /*
1106           * stats_e_disabled: set this to 'yes' to disable "STATS e" for both
# Line 1052 | Line 1110 | general {
1110           */
1111          stats_e_disabled = no;
1112  
1113 <        /* stats_o_oper only: make stats o (opers) oper only */
1113 >        /* stats_o_oper_only: make stats o (opers) oper only */
1114          stats_o_oper_only = yes;
1115  
1116          /* stats_P_oper_only: make stats P (ports) oper only */
1117          stats_P_oper_only = yes;
1118  
1119 +        /* stats_u_oper_only: make stats u (uptime) oper only */
1120 +        stats_u_oper_only = no;
1121 +
1122          /*
1123 <         * stats i oper only: make stats i (auth {}) oper only. Set to:
1123 >         * stats_i_oper_only: make stats i (auth {}) oper only. Set to:
1124           *     yes    - show users no auth blocks, made oper only.
1125 <         *     masked - show users first matching auth block
1125 >         *     masked - show users the first matching auth block
1126           *     no     - show users all auth blocks.
1127           */
1128          stats_i_oper_only = yes;
# Line 1069 | Line 1130 | general {
1130          /*
1131           * stats_k_oper_only: make stats k/K (klines) oper only. Set to:
1132           *     yes    - show users no auth blocks, made oper only
1133 <         *     masked - show users first matching auth block
1133 >         *     masked - show users the first matching auth block
1134           *     no     - show users all auth blocks.
1135           */
1136          stats_k_oper_only = yes;
# Line 1087 | Line 1148 | general {
1148          opers_bypass_callerid = no;
1149  
1150          /*
1151 <         * pace_wait_simple: time between use of less intensive commands
1152 <         * (ADMIN, HELP, (L)USERS, VERSION, remote WHOIS)
1151 >         * pace_wait_simple: minimum time required between use of less
1152 >         * intensive commands
1153 >         * (ADMIN, HELP, LUSERS, VERSION, remote WHOIS)
1154           */
1155          pace_wait_simple = 1 second;
1156  
1157          /*
1158 <         * pace_wait: time between more intensive commands
1159 <         * (AWAY, INFO, LINKS, MAP, MOTD, STATS, WHO, wildcard WHOIS, WHOWAS)
1158 >         * pace_wait: minimum time required between use of more intensive commands
1159 >         * (AWAY, INFO, LINKS, MAP, MOTD, STATS, WHO, WHOWAS)
1160           */
1161          pace_wait = 10 seconds;
1162  
1163          /*
1164 <         * short_motd: send clients a notice telling them to read the motd
1165 <         * instead of forcing a motd to clients who may simply ignore it.
1164 >         * short_motd: send clients a notice telling them to read the MOTD
1165 >         * instead of forcing an MOTD to clients who may simply ignore it.
1166           */
1167          short_motd = no;
1168  
# Line 1122 | Line 1184 | general {
1184          /* oper_pass_resv: allow opers to over-ride RESVs on nicks/channels. */
1185          oper_pass_resv = yes;
1186  
1187 <        /* REMOVE ME.  The following line checks you've been reading. */
1187 >        /* REMOVE ME. The following line checks that you have been reading. */
1188          havent_read_conf = 1;
1189  
1190          /*
1191 <         * max_targets: the maximum amount of targets in a single
1191 >         * max_targets: the maximum number of targets in a single
1192           * PRIVMSG/NOTICE. Set to 999 NOT 0 for unlimited.
1193           */
1194          max_targets = 4;
# Line 1144 | Line 1206 | general {
1206           * +G - softcallerid - Server Side Ignore for users not on your channels
1207           * +g - callerid     - Server Side Ignore (for privmsgs etc)
1208           * +H - hidden       - Hides operator status to other users
1209 <         * +i - invisible    - Not shown in NAMES or WHO unless you share a
1148 <         *                     a channel
1209 >         * +i - invisible    - Not shown in NAMES or WHO unless you share a channel
1210           * +j - rej          - See rejected client notices
1211           * +k - skill        - See server generated KILL messages
1212           * +l - locops       - See LOCOPS messages
1213           * +n - nchange      - See client nick changes
1214 +         * +p - hidechans    - Hides channel list in WHOIS
1215 +         * +q - hideidle     - Hides idle and signon time in WHOIS
1216           * +R - nononreg     - Only receive private messages from registered clients
1217           * +s - servnotice   - See general server notices
1218           * +u - unauth       - See unauthorized client notices
1219           * +w - wallop       - See server generated WALLOPS
1220           * +y - spy          - See LINKS, STATS, TRACE notices etc.
1158         * +z - operwall     - See oper generated WALLOPS
1221           */
1222  
1223          /* oper_only_umodes: usermodes only opers may set */
1224          oper_only_umodes = bots, cconn, debug, full, hidden, skill,
1225 <                           nchange, rej, spy, external, operwall,
1226 <                           locops, unauth, farconnect;
1225 >                        nchange, rej, spy, external,
1226 >                        locops, unauth, farconnect;
1227  
1228          /* oper_umodes: default usermodes opers get when they /oper */
1229 <        oper_umodes = bots, locops, servnotice, operwall, wallop;
1229 >        oper_umodes = bots, locops, servnotice, wallop;
1230  
1231          /*
1232           * use_egd: if your system does not have *random devices yet you
# Line 1179 | Line 1241 | general {
1241           */
1242   #       egdpool_path = "/var/run/egd-pool";
1243  
1244 +
1245 +        /*
1246 +         * throttle_count: the maximum number of connections from the same
1247 +         * IP address allowed in throttle_time duration.
1248 +         */
1249 +        throttle_count = 1;
1250 +
1251          /*
1252 <         * throttle_time: the minimum amount of time between connections from
1253 <         * the same ip. exempt {} blocks are excluded from this throttling.
1252 >         * throttle_time: the minimum amount of time required between
1253 >         * connections from the same IP address. exempt {} blocks are
1254 >         * excluded from this throttling.
1255           * Offers protection against flooders who reconnect quickly.
1256           * Set to 0 to disable.
1257           */
1258 <        throttle_time = 10;
1258 >        throttle_time = 2 seconds;
1259   };
1260  
1261   modules {
# Line 1243 | Line 1313 | log {
1313                  size = 50 megabytes;
1314          };
1315  
1316 +        file {
1317 +                type = xline;
1318 +                name = "/usr/local/ircd/var/log/xline.log";
1319 +                size = 50 megabytes;
1320 +        };
1321 +
1322 +        file {
1323 +                type = resv;
1324 +                name = "/usr/local/ircd/var/log/resv.log";
1325 +                size = 50 megabytes;
1326 +        };
1327 +
1328          file {
1329                  type = debug;
1330                  name = "/usr/local/ircd/var/log/debug.log";

Diff Legend

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