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 2196 by michael, Tue Jun 4 18:30:12 2013 UTC vs.
Revision 6592 by michael, Wed Oct 21 20:16:57 2015 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-2015 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";
44 >        name = "server.example.net";
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 +         * A sid is automatically generated at runtime, if you want to configure
54 +         * a specific sid, uncomment the following line.
55           */
56 <        sid = "0HY";
56 > #       sid = "0HY";
57  
58          /*
59           * description: the description of the server.
# Line 57 | Line 61 | serverinfo {
61          description = "ircd-hybrid test server";
62  
63          /*
64 <         * network info: the name and description of the network this server
65 <         * is on. Shown in the 005 reply and used with serverhiding.
64 >         * network_name, network_desc: the name and description of the network this
65 >         * server is on. Shown in the 005 reply and used with serverhiding.
66           */
67          network_name = "MyNet";
68          network_desc = "This is My Network";
# Line 70 | Line 74 | serverinfo {
74          hub = no;
75  
76          /*
77 <         * vhost: the IP to bind to when we connect outward to ipv4 servers.
78 <         * This should be an ipv4 IP only, or "*" for INADDR_ANY.
77 >         * vhost: the IP address to bind to when we connect outward to IPv4 servers.
78 >         * This should be an IPv4 address, or "*" for INADDR_ANY.
79           */
80 < #       vhost = "192.169.0.1";
80 > #       vhost = "192.0.2.1";
81  
82          /*
83 <         * vhost6: the IP to bind to when we connect outward to ipv6 servers.
84 <         * This should be an ipv6 IP only, or "*" for INADDR_ANY.
83 >         * vhost6: the IP address to bind to when we connect outward to IPv6 servers.
84 >         * This should be an IPv6 address, or "*" for in6addr_any.
85           */
86 < #       vhost6 = "3ffe:80e8:546::2";
86 > #       vhost6 = "2001:DB8::1";
87  
88 <        /* max_clients: the maximum number of clients allowed to connect. */
89 <        max_clients = 512;
88 >        /*
89 >         * default_max_clients: the default maximum number of clients allowed
90 >         * to connect. This can be changed from within IRC via /QUOTE SET MAX.
91 >         */
92 >        default_max_clients = 512;
93  
94          /*
95           * max_nick_length: only applies to local clients. Must be in the
# Line 98 | Line 105 | serverinfo {
105          max_topic_length = 160;
106  
107          /*
108 <         * rsa_private_key_file: the path to the file containing our
109 <         * rsa key for cryptlink.
108 >         * rsa_private_key_file: the path to the file containing the
109 >         * RSA key.
110 >         *
111 >         * Example commands to store a 2048 bit RSA key in rsa.key:
112           *
104         * Example command to store a 2048 bit RSA keypair in
105         * rsa.key, and the public key in rsa.pub:
106         *
113           *      openssl genrsa -out rsa.key 2048
114 <         *      openssl rsa -in rsa.key -pubout -out rsa.pub
109 <         *      chown <ircd-user>.<ircd.group> rsa.key rsa.pub
114 >         *      chown <ircd-user>.<ircd.group> rsa.key
115           *      chmod 0600 rsa.key
111         *      chmod 0644 rsa.pub
116           */
117 < #       rsa_private_key_file = "/usr/local/ircd/etc/rsa.key";
117 > #       rsa_private_key_file = "etc/rsa.key";
118  
119          /*
120           * ssl_certificate_file: the path to the file containing our
121 <         * ssl certificate for encrypted client connection.
121 >         * SSL certificate for encrypted client connection.
122           *
123           * This assumes your private RSA key is stored in rsa.key. You
124           * MUST have an RSA key in order to generate the certificate.
# Line 123 | Line 127 | serverinfo {
127           *
128           *      openssl req -new -days 365 -x509 -key rsa.key -out cert.pem
129           *
126         * See http://www.openssl.org/docs/HOWTO/certificates.txt
127         *
130           * Please use the following values when generating the cert
131           *
132           *      Organization Name: Network Name
133 <         *      Organization Unit Name: changme.someirc.net
134 <         *      Common Name: irc.someirc.net
135 <         *      E-mail: you@domain.com
133 >         *      Organization Unit Name: unit.example.net
134 >         *      Common Name: irc.example.net
135 >         *      E-mail: email@example.net
136           */
137 < #       ssl_certificate_file = "/usr/local/ircd/etc/cert.pem";
137 > #       ssl_certificate_file = "etc/cert.pem";
138  
139          /*
140 <         * ssl_dh_param_file:
141 <         *
142 <         * Path to the PEM encoded Diffie-Hellman parameter file.
141 <         * DH parameters are strictly required when using ciphers
142 <         * with EDH (ephemeral Diffie-Hellman) key exchange.
140 >         * ssl_dh_param_file: path to the PEM encoded Diffie-Hellman
141 >         * parameter file. DH parameters are required when using
142 >         * ciphers with EDH (ephemeral Diffie-Hellman) key exchange.
143           *
144           * A DH parameter file can be created by running:
145           *
146 <         *      openssl dhparam -out dhparam.pem 1024
146 >         *      openssl dhparam -out dhparam.pem 2048
147           *
148           * Prime size must be at least 1024 bits. Further information
149           * regarding specific OpenSSL dhparam command-line options
150           * can be found in the OpenSSL manual.
151           */
152 < #       ssl_dh_param_file = "/usr/local/ircd/etc/dhparam.pem";
152 > #       ssl_dh_param_file = "etc/dhparam.pem";
153  
154          /*
155 <         * ssl_cipher_list:
155 >         * ssl_dh_elliptic_curve: defines the curve to use for the
156 >         * Elliptic Curve Diffie-Hellman (ECDH) algorithm.
157 >         * Default is ANSI X9.62 prime256v1/secp256r1 if nothing else is specified.
158 >         *
159 >         * A list of supported curves by OpenSSL can be obtained by running:
160           *
161 <         * List of ciphers that are supported by _this_ server. Can be used to
162 <         * enforce specific ciphers for incoming SSL/TLS connections.
163 <         * If a client (which also includes incoming server connections) isn't
164 <         * capable of any cipher listed below, the connection will simply be
165 <         * rejected.
161 >         *      openssl ecparam -list_curves
162 >         */
163 > #       ssl_dh_elliptic_curve = "secp521r1";
164 >
165 >        /*
166 >         * ssl_cipher_list: list of ciphers to support on _this_ server.
167 >         * Can be used to enforce specific ciphers for incoming SSL/TLS
168 >         * connections. If a client (which also includes incoming server connections)
169 >         * is not 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
174 >         *      openssl ciphers -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: defines what cryptographic hash function
183 >         * to use for generating fingerprint hashes of X.509 certificates.
184 >         * Default is SHA-256 if nothing else is specified.
185           *
186 <         * SSL/TLS methods we provide for incoming (server method) and
187 <         * outgoing (client method) SSL/TLS connections.
188 <         * This can be either sslv3 for SSLv3, and/or tlsv1 for TLSv1.
186 >         * A list of supported message digest algorithms by OpenSSL can be obtained by running:
187 >         *
188 >         *      openssl list-message-digest-algorithms
189           */
190 < #       ssl_server_method = tlsv1, sslv3;
181 < #       ssl_client_method = tlsv1;
190 > #       ssl_message_digest_algorithm = "sha256";
191   };
192  
193   /*
194 < * admin {}:  contains admin information about the server
194 > * admin {}:  contains administrative information about the server
195   */
196   admin {
197          name = "Smurf target";
198          description = "Main Server Administrator";
199 <        email = "<syn@packets.r.us>";
199 >        email = "<admin@server.example.net>";
200   };
201  
202   /*
# 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  
227          /*
228 <         * max_global: network-wide limit of users per ident@host  (optional)
228 >         * max_global: network-wide limit of users per ident@host (optional)
229           */
230          max_global = 10;
231  
# Line 226 | Line 235 | class {
235          max_number = 100;
236  
237          /*
238 <         * the following lines are optional and allow you to define
238 >         * The following lines are optional and allow you to define
239           * how many users can connect from one /NN subnet.
240           */
241          cidr_bitlen_ipv4 = 24;
# 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
253 <         * they are dropped for flooding. Defaults to 2560 if the chosen
254 <         * value isn't within the range of 512 to 8000.
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 value
254 >         * isn't within the range of 512 to 8000.
255           */
256          recvq = 2560 bytes;
257   };
# Line 255 | Line 264 | class {
264          sendq = 100 kbytes;
265  
266          /*
267 +         * max_channels: maximum number of channels users in this class can join.
268 +         */
269 +        max_channels = 60;
270 +
271 +        /*
272           * min_idle: minimum idle time that is shown in /whois.
273           */
274          min_idle = 3 hours;
# Line 267 | Line 281 | class {
281          /*
282           * flags:
283           *
284 <         * random_idle          - idle time is randomly selected within the
285 <         *                        range of min_idle to max_idle
286 <         * hide_idle_from_opers - fake idle time will be shown to operators, too
284 >         * random_idle          - a fake idle time is set randomly between
285 >         *                        min_idle and max_idle
286 >         * hide_idle_from_opers - the fake idle time will also be shown to operators
287           */
288          flags = random_idle, hide_idle_from_opers;
289   };
# Line 284 | Line 298 | class {
298           */
299          connectfreq = 5 minutes;
300  
301 <        /* max number: the amount of servers to autoconnect to. */
301 >        /* max number: the number of servers to autoconnect to. */
302          max_number = 1;
303  
304          /* sendq: servers need a higher sendq as they send more data. */
# Line 292 | Line 306 | class {
306   };
307  
308   /*
309 < * motd {}: specifies various MOTD files. Applies to local users only.
309 > * motd {}: Allows the display of a different MOTD to a client
310 > * depending on its origin. Applies to local users only.
311   */
312   motd {
313          /*
314           * mask: multiple mask entries are permitted. Mask can either be
315 <         * a class name or a hostname.
315 >         * a class name or a hostname. CIDR is supported.
316           */
317          mask = "*.at";
318          mask = "*.de";
# Line 306 | Line 321 | motd {
321          /*
322           * file: path to the actual motd file.
323           */
324 <        file = "/usr/local/ircd/etc/german.motd";
324 >        file = "etc/german.motd";
325   };
326  
327   /*
# Line 314 | Line 329 | motd {
329   */
330   listen {
331          /*
332 <         * port: the specific port to listen on. If no host is specified
333 <         * before, it will listen on all available IPs.
332 >         * port: the port to listen on. If no host is specified earlier in the
333 >         * listen {} block, it will listen on all available IP addresses.
334           *
335 <         * Ports are separated via a comma, a range may be specified using ".."
335 >         * Ports are separated by commas; a range may be specified using ".."
336           */
337 <        
338 <        /* port: listen on all available IPs, ports 6665 to 6669 */
337 >
338 >        /* port: listen on all available IP addresses, ports 6665 to 6669. */
339          port = 6665 .. 6669;
340  
341          /*
342 <         * Listen on 192.168.0.1/6697 with ssl enabled and hidden from STATS P
342 >         * Listen on 192.0.2.1/6697 with SSL enabled and hidden from STATS P
343           * unless you are an administrator.
344           *
345 <         * NOTE: The "flags" directive has to come before "port". Always!
345 >         * NOTE: The "flags" directive always has to come before "port".
346           *
347           * Currently available flags are:
348           *
# Line 336 | Line 351 | listen {
351           *  hidden - Port is hidden from /stats P, unless you're an admin
352           */
353          flags = hidden, ssl;
354 <        host = "192.168.0.1";
354 >        host = "192.0.2.2";
355          port = 6697;
356  
357          /*
358 <         * host: set a specific IP/host the ports after the line will listen
359 <         * on. This may be ipv4 or ipv6.
358 >         * host: set a specific IP address to listen on using the
359 >         * subsequent port definitions. This may be IPv4 or IPv6.
360           */
361 <        host = "1.2.3.4";
361 >        host = "192.0.2.3";
362          port = 7000, 7001;
363  
364 <        host = "3ffe:1234:a:b:c::d";
364 >        host = "2001:DB8::2";
365          port = 7002;
366   };
367  
# Line 356 | Line 371 | listen {
371   auth {
372          /*
373           * user: the user@host allowed to connect. Multiple user
374 <         * lines are permitted per auth block.
374 >         * lines are permitted within each auth {} block.
375           */
376 <        user = "*@172.16.0.0/12";
377 <        user = "*test@123D:B567:*";
376 >        user = "*@192.0.2.0/24";
377 >        user = "*test@2001:DB8:*";
378  
379 <        /* password: an optional password that is required to use this block */
379 >        /* password: an optional password that is required to use this block. */
380          password = "letmein";
381  
382          /*
383           * encrypted: controls whether the auth password above has been
384 <         * encrypted.
384 >         * encrypted. Default is 'no' if nothing else is specified.
385           */
386          encrypted = yes;
387  
388          /*
389 <         * spoof: fake the users host to this. This is free-form, just do
389 >         * spoof: fake the user's host to this. This is free-form, just do
390           * everyone a favor and don't abuse it. ('=' prefix on /stats I)
391           */
392          spoof = "I.still.hate.packets";
393  
394 <        /* class: the class the user is placed in */
394 >        /* class: the class the user is placed in. */
395          class = "opers";
396  
397          /*
398 <         * need_password - don't allow users who haven't supplied the correct
399 <         *                 password to connect using another auth{} block
400 <         *                 ('&' prefix on /stats I if disabled)
386 <         * need_ident    - require the user to have identd to connect ('+' prefix on /stats I)
398 >         * need_password - don't allow users who haven't supplied the correct  | ('&' prefix on /stats I if disabled)
399 >         *                 password to connect using another auth {} block
400 >         * need_ident    - require the user to have identd to connect          | ('+' prefix on /stats I)
401           * spoof_notice  - enable spoofing notification to admins
402 <         * exceed_limit  - allow a user to exceed class limits ('>' prefix on /stats I)
403 <         * kline_exempt  - exempt this user from k/glines ('^' prefix on /stats I)
404 <         * gline_exempt  - exempt this user from glines ('_' prefix on /stats I)
405 <         * resv_exempt   - exempt this user from resvs ('$' prefix on /stats I)
406 <         * no_tilde      - remove ~ from a user with no ident ('-' prefix on /stats I)
407 <         * can_flood     - allow this user to exceed flood limits ('|' prefix on /stats I)
408 <         * webirc        - enables WEBIRC authentication for web-based clients such as Mibbit
409 <         *                 ('<' prefix on /stats I)
402 >         * exceed_limit  - allow a user to exceed class limits                 | ('>' prefix on /stats I)
403 >         * kline_exempt  - exempt this user from k-lines                       | ('^' prefix on /stats I)
404 >         * xline_exempt  - exempt this user from x-lines                       | ('!' prefix on /stats I)
405 >         * resv_exempt   - exempt this user from resvs                         | ('$' prefix on /stats I)
406 >         * no_tilde      - remove ~ from a user with no ident                  | ('-' prefix on /stats I)
407 >         * can_flood     - allow this user to exceed flood limits              | ('|' prefix on /stats I)
408 >         * webirc        - enables WEBIRC authentication for web-based         | ('<' prefix on /stats I)
409 >         *                 clients such as Mibbit
410           */
411          flags = need_password, spoof_notice, exceed_limit, kline_exempt,
412 <                gline_exempt, resv_exempt, no_tilde, can_flood;
412 >                xline_exempt, resv_exempt, no_tilde, can_flood;
413   };
414  
415   auth {
416          /*
417 <         * redirect: the server and port to redirect a user to. A user does not
418 <         * have to obey the redirection, the ircd just suggests an alternative
419 <         * server for them.
417 >         * redirserv, redirport: the server and port to redirect a user to.
418 >         * A user does not have to obey the redirection; the ircd just
419 >         * suggests an alternative server for them.
420           */
421 <        redirserv = "this.is.not.a.real.server";
421 >        redirserv = "server2.example.net";
422          redirport = 6667;
409        
410        user = "*.server";
423  
424 <        /* class: a class is required even though it is not used */
424 >        user = "*@*.ch";
425 >
426 >        /* class: a class is required even though it is not used. */
427          class = "users";
428   };
429  
# Line 423 | Line 437 | auth {
437   * operator {}:  defines ircd operators
438   */
439   operator {
440 <        /* name: the name of the oper */
440 >        /* name: the name of the operator */
441          name = "sheep";
442  
443          /*
444 <         * user: the user@host required for this operator. Multiple
445 <         * user="" lines are supported.
444 >         * user: the user@host required for this operator. Multiple user
445 >         * lines are permitted within each operator {} block.
446           */
447 <        user = "*sheep@192.168.0.0/16";
448 <        user = "*@127.0.0.0/8";
447 >        user = "*sheep@192.0.2.0/26";
448 >        user = "*@192.0.2.240/28";
449  
450          /*
451           * password: the password required to oper. By default this will
452           * need to be encrypted by using the provided mkpasswd tool.
453           * Several password hash algorithms are available depending
454           * on your system's crypt() implementation. For example, a modern
455 <         * glibc already has support for SHA-256/512, and MD5 encryption
455 >         * glibc already has support for the SHA-256/512 and MD5 encryption
456           * algorithms.
457           */
458          password = "$5$x5zof8qe.Yc7/bPp$5zIg1Le2Lsgd4CvOjaD20pr5PmcfD7ha/9b2.TaUyG4";
459  
460          /*
461           * encrypted: controls whether the oper password above has been
462 <         * encrypted.
462 >         * encrypted. Default is 'yes' if nothing else is specified.
463           */
464          encrypted = yes;
465  
466          /*
467 <         * rsa_public_key_file: the public key for this oper when using Challenge.
468 <         * A password should not be defined when this is used, see
469 <         * doc/challenge.txt for more information.
467 >         * whois: allows to override the default RPL_WHOISOPERATOR numeric
468 >         * string shown in /whois.
469 >         * This string is propagated to all servers on the network.
470 >         */
471 > #       whois = "is a Smurf Target (IRC Operator)";
472 >
473 >        /*
474 >         * ssl_certificate_fingerprint: enhances security by additionally checking
475 >         * the oper's client certificate fingerprint against the specified
476 >         * fingerprint below.
477 >         *
478 >         * Hint: your users can use the following command to obtain a SHA-256 hash
479 >         * of their ssl certificate:
480 >         *
481 >         *      openssl x509 -sha256 -noout -fingerprint -in cert.pem | sed -e 's/^.*=//;s/://g'
482 >         */
483 > #       ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D";
484 >
485 >        /*
486 >         * ssl_connection_required: client must be connected over SSL/TLS
487 >         * in order to be able to use this operator {} block.
488 >         * Default is 'no' if nothing else is specified.
489           */
490 < #       rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
490 >        ssl_connection_required = no;
491  
492 <        /* class: the class the oper joins when they successfully /oper */
492 >        /* class: the class the oper joins when they successfully /oper. */
493          class = "opers";
494  
495          /*
496 <         * umodes: default usermodes opers get when they /oper. If defined,
497 <         * it will override oper_umodes settings in general {}.
498 <         * Available usermodes:
496 >         * umodes: the default user modes opers get when they /oper.
497 >         * If defined, it will override oper_umodes settings in general {}.
498 >         * Available user modes:
499           *
500           * +b - bots         - See bot and drone flooding notices
501           * +c - cconn        - Client connection/quit notices
# Line 470 | Line 503 | operator {
503           * +d - debug        - See debugging notices
504           * +e - external     - See remote server connection and split notices
505           * +F - farconnect   - Remote client connection/quit notices
506 <         * +f - full         - See auth{} block full notices
506 >         * +f - full         - See auth {} block full notices
507           * +G - softcallerid - Server Side Ignore for users not on your channels
508           * +g - callerid     - Server Side Ignore (for privmsgs etc)
509           * +H - hidden       - Hides operator status to other users
510 <         * +i - invisible    - Not shown in NAMES or WHO unless you share a
478 <         *                     a channel
510 >         * +i - invisible    - Not shown in NAMES or WHO unless you share a channel
511           * +j - rej          - See rejected client notices
512           * +k - skill        - See server generated KILL messages
513           * +l - locops       - See LOCOPS messages
514           * +n - nchange      - See client nick changes
515 +         * +p - hidechans    - Hides channel list in WHOIS
516 +         * +q - hideidle     - Hides idle and signon time in WHOIS
517           * +R - nononreg     - Only receive private messages from registered clients
518           * +s - servnotice   - See general server notices
519           * +u - unauth       - See unauthorized client notices
520           * +w - wallop       - See server generated WALLOPS
521           * +y - spy          - See LINKS, STATS, TRACE notices etc.
488         * +z - operwall     - See oper generated WALLOPS
522           */
523 <        umodes = locops, servnotice, operwall, wallop;
523 >        umodes = locops, servnotice, wallop;
524  
525          /*
526 <         * privileges: controls the activities and commands an oper is
527 <         * allowed to do on the server. All options default to no.
528 <         * Available options:
526 >         * flags: controls the activities and commands an oper is
527 >         * allowed to do on the server. All flags default to 'no'.
528 >         * Available flags:
529           *
530 <         * module         - allows MODULE
530 >         * admin          - gives administrator privileges    | ('A' flag)
531 >         * close          - allows CLOSE
532           * connect        - allows local CONNECT              | ('P' flag)
533           * connect:remote - allows remote CONNECT             | ('Q' flag)
534 <         * squit          - allows local SQUIT                | ('R' flag)
535 <         * squit:remote   - allows remote SQUIT               | ('S' flag)
534 >         * die            - allows DIE                        | ('D' flag)
535 >         * dline          - allows DLINE                      |
536 >         * globops        - allows GLOBOPS                    |
537 >         * join:resv      - allows to JOIN resv {} channels
538           * kill           - allows to KILL local clients      | ('N' flag)
539           * kill:remote    - allows remote users to be /KILL'd | ('O' flag)
504         * remoteban      - allows remote KLINE/UNKLINE       | ('B' flag)
505         * dline          - allows DLINE                      |
506         * undline        - allows UNDLINE                    |
540           * kline          - allows KLINE                      | ('K' flag)
508         * unkline        - allows UNKLINE                    | ('U' flag)
509         * gline          - allows GLINE                      | ('G' flag)
510         * xline          - allows XLINE                      | ('X' flag)
541           * locops         - allows LOCOPS                     |
542 <         * globops        - allows GLOBOPS                    |
543 <         * wallops        - allows WALLOPS                    |
544 <         * operwall       - allows OPERWALL                   | ('L' flag)
542 >         * module         - allows MODULE                     |
543 >         * nick:resv      - allows to use NICK on resv {} nicks
544 >         * opme           - allows OPME                       |
545           * rehash         - allows oper to REHASH config      | ('H' flag)
546 <         * die            - allows DIE                        | ('D' flag)
546 >         * remoteban      - allows remote KLINE/UNKLINE       | ('B' flag)
547           * restart        - allows RESTART                    |
548 +         * resv           - allows RESV
549           * set            - allows SET                        |
550 <         * admin          - gives administrator privileges    | ('A' flag)
550 >         * squit          - allows local SQUIT                | ('R' flag)
551 >         * squit:remote   - allows remote SQUIT               | ('S' flag)
552 >         * undline        - allows UNDLINE                    |
553 >         * unkline        - allows UNKLINE                    | ('U' flag)
554 >         * unresv         - allows UNRESV
555 >         * unxline        - allows UNXLINE                    |
556 >         * wallops        - allows WALLOPS                    |
557 >         * xline          - allows XLINE                      | ('X' flag)
558           */
559 <        flags = kill, kill:remote, connect, connect:remote, kline, unkline,
560 <                xline, globops, restart, die, rehash, admin, operwall, module;
559 >        flags = admin, connect, connect:remote, die, globops, kill, kill:remote,
560 >                kline, module, rehash, restart, set, unkline, unxline, xline;
561   };
562  
563   /*
564 < * service {}: specifies what server may act as a network service
527 < *
528 < * NOTE: it is absolutely important that every single server on the network
529 < *       has the same service{} block.
530 < */
531 < service {
532 <        name = "service.someserver";
533 <        name = "stats.someserver";
534 < };
535 <
536 < /*
537 < * connect {}:  controls servers we connect to
564 > * connect {}: define a server to connect to
565   */
566   connect {
567 <        /* name: the name of the server */
568 <        name = "irc.uplink.com";
567 >        /* name: the name of the server. */
568 >        name = "uplink.example.net";
569  
570          /*
571 <         * host: the host or IP to connect to. If a hostname is used it
572 <         * must match the reverse dns of the server.
571 >         * host: the host or IP address to connect to. If a hostname is used it
572 >         * must match the reverse DNS of the server.
573           */
574 <        host = "192.168.0.1";
574 >        host = "192.0.2.4";
575  
576          /*
577 <         * vhost: the IP to bind to when we connect outward to servers.
577 >         * vhost: the IP address to bind to when making outgoing connections to
578 >         * servers.
579           * serverinfo::vhost and serverinfo::vhost6 will be overridden
580           * by this directive.
581           */
582 <        vhost = "192.168.0.2";
582 >        vhost = "192.0.2.5";
583  
584          /*
585 <         * passwords: the passwords we send (OLD C:) and accept (OLD N:).
586 <         * The remote server will have these passwords reversed.
585 >         * send_password, accept_password: the passwords to send and accept.
586 >         * The remote server will have these passwords swapped.
587           */
588          send_password = "password";
589          accept_password = "anotherpassword";
# Line 566 | Line 594 | connect {
594           */
595          encrypted = no;
596  
597 <        /* port: the port to connect to this server on */
597 >        /* port: the port to connect to this server on. */
598          port = 6666;
599  
600          /*
# Line 581 | Line 609 | connect {
609           */
610   #       leaf_mask = "*.uk";
611  
612 <        /* class: the class this server is in */
612 >        /* class: the class this server is in. */
613          class = "server";
614  
615          /*
616 <         * ssl_cipher_list:
617 <         *
618 <         * List of ciphers that the server we are connecting to must support.
591 <         * If the server isn't capable of any cipher listed below, the
592 <         * connection will simply be rejected.
616 >         * ssl_cipher_list: list of ciphers that the server we are connecting to
617 >         * must support. If the server is not capable of using any of the ciphers
618 >         * listed below, the connection will simply be rejected.
619           * Can be used to enforce stronger ciphers, even though this option
620           * is not necessarily required to establish a SSL/TLS connection.
621           *
622           * Multiple ciphers are separated by colons. The order of preference
623           * is from left to right.
624           */
625 < #       ssl_cipher_list = "DHE-RSA-AES256-SHA:AES256-SHA";
625 > #       ssl_cipher_list = "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA:AES256-SHA";
626 >
627 >        /*
628 >         * ssl_certificate_fingerprint: enhances security by additionally checking
629 >         * the server's client certificate fingerprint against the specified
630 >         * fingerprint below.
631 >         */
632 > #       ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D";
633  
634          /*
635           * autoconn   - controls whether we autoconnect to this server or not,
# Line 607 | Line 640 | connect {
640   };
641  
642   connect {
643 <        name = "ipv6.some.server";
644 <        host = "3ffd:dead:beef::1";
643 >        name = "ipv6.example.net";
644 >        host = "2001:DB8::3";
645          send_password = "password";
646          accept_password = "password";
647          port = 6666;
# Line 627 | Line 660 | connect {
660   */
661   cluster {
662          /*
663 <         * name: the server to share with, this can take wildcards
663 >         * name: the server to share with; this can take wildcards
664           *
665 <         * NOTE: only local actions will be clustered, meaning if
665 >         * NOTE: only local actions will be clustered, meaning that if
666           *       the server receives a shared kline/unkline/etc, it
667           *       will not be propagated to clustered servers.
668           *
669           *       Remote servers are not necessarily required to accept
670 <         *       clustered lines, they need a shared{} for *THIS* server
671 <         *       in order to accept them.
670 >         *       clustered lines, they need a shared {} block for *THIS*
671 >         *       server in order to accept them.
672           */
673 <        name = "*.arpa";
673 >        name = "*.example.net";
674  
675          /*
676 <         * type: list of what to share, options are as follows:
676 >         * type: list of what to share; options are as follows:
677           *      dline   - share dlines
678           *      undline - share undlines
679           *      kline   - share klines
# Line 658 | Line 691 | cluster {
691   /*
692   * shared {}: users that are allowed to remote kline
693   *
694 < * NOTE: This can be effectively used for remote klines.
694 > * NOTE: This can effectively be used for remote klines.
695   *       Please note that there is no password authentication
696   *       for users setting remote klines. You must also be
697   *       /oper'd in order to issue a remote kline.
698   */
699   shared {
700          /*
701 <         * name: the server the user must be on to set klines. If this is not
702 <         * specified, the user will be allowed to kline from all servers.
701 >         * name: the server the user must be connected to in order to set klines.
702 >         * If this is not specified, the user will be allowed to kline from all
703 >         * servers.
704           */
705 <        name = "irc2.some.server";
705 >        name = "irc2.example.net";
706  
707          /*
708           * user: the user@host mask that is allowed to set klines. If this is
# Line 695 | Line 729 | shared {
729  
730   /*
731   * kill {}:  users that are not allowed to connect
732 < * Oper issued klines will be added to the specified kline config
732 > * Oper issued klines will be added to the specified kline database
733   */
734   kill {
735 <        user = "bad@*.hacked.edu";
735 >        user = "bad@*.example.net";
736          reason = "Obviously hacked account";
737   };
738  
739   /*
740 < * deny {}:  IPs that are not allowed to connect (before DNS/ident lookup)
741 < * Oper issued dlines will be added to the specified dline config
740 > * deny {}:  IP addresses that are not allowed to connect
741 > * (before DNS/ident lookup)
742 > * Oper issued dlines will be added to the specified dline database
743   */
744   deny {
745 <        ip = "10.0.1.0/24";
745 >        ip = "192.0.2.0/28";
746          reason = "Reconnecting vhosted bots";
747   };
748  
749   /*
750 < * exempt {}:  IPs that are exempt from deny {} and Dlines
750 > * exempt {}:  IP addresses that are exempt from deny {} and Dlines
751   */
752   exempt {
753 <        ip = "192.168.0.0/16";
753 >        ip = "192.0.2.240/28";
754   };
755  
756   /*
757   * resv {}:  nicks and channels users may not use/join
758   */
759   resv { mask = "clone*"; reason = "Clone bots"; };
760 + resv { mask = "Global"; reason = "Reserved for services"; };
761   resv { mask = "ChanServ"; reason = "Reserved for services"; };
762   resv { mask = "NickServ"; reason = "Reserved for services"; };
763   resv { mask = "OperServ"; reason = "Reserved for services"; };
# Line 735 | Line 771 | resv { mask = "#*services*"; reason = "R
771   resv {
772          /*
773           * mask: masks starting with a '#' are automatically considered
774 <         * as channel name mask.
774 >         * as channel name masks.
775           */
776          mask = "#helsinki";
777 <        reason = "Channel is reserved for finnish inhabitants";
777 >        reason = "Channel is reserved for Finnish inhabitants";
778  
779          /*
780           * exempt: can be either a ISO 3166 alpha-2 two letter country
# Line 749 | Line 785 | resv {
785   };
786  
787   /*
788 < * gecos {}:  Used for banning users based on their "realname".
788 > * gecos {}:  used for banning users based on their "realname".
789   */
790   gecos {
791          name = "*sex*";
# Line 762 | Line 798 | gecos {
798   };
799  
800   /*
801 < * channel {}:  The channel block contains options pertaining to channels
801 > * service {}: specifies a server which may act as a network service
802 > *
803 > * NOTE: it is very important that every server on the network
804 > *       has the same service {} block.
805 > */
806 > service {
807 >        name = "service.example.net";
808 >        name = "stats.example.net";
809 > };
810 >
811 > /*
812 > * pseudo {}: adds pseudo/custom commands also known as service aliases
813 > */
814 > pseudo {
815 >        /* command: the actual command/alias. */
816 >        command = "IDENTIFY";
817 >
818 >        /* prepend: optional text that can be prepended before the user's message. */
819 >        prepend = "IDENTIFY ";
820 >
821 >        /* name: the service name, used for error messages. */
822 >        name = "NickServ";
823 >
824 >        /* target: the actual target where this message should be sent to. */
825 >        target = "NickServ@service.example.net";
826 > };
827 >
828 > pseudo {
829 >        command = "CHANSERV";
830 >        name = "ChanServ";
831 >        target = "ChanServ@service.example.net";
832 > };
833 >
834 > pseudo {
835 >        command = "CS";
836 >        name = "ChanServ";
837 >        target = "ChanServ@service.example.net";
838 > };
839 >
840 > pseudo {
841 >        command = "NICKSERV";
842 >        name = "NickServ";
843 >        target = "NickServ@service.example.net";
844 > };
845 >
846 > pseudo {
847 >        command = "NS";
848 >        name = "NickServ";
849 >        target = "NickServ@service.example.net";
850 > };
851 >
852 > pseudo {
853 >        command = "MEMOSERV";
854 >        name = "MemoServ";
855 >        target = "MemoServ@service.example.net";
856 > };
857 >
858 > pseudo {
859 >        command = "MS";
860 >        name = "MemoServ";
861 >        target = "MemoServ@service.example.net";
862 > };
863 >
864 > pseudo {
865 >        command = "OPERSERV";
866 >        name = "OperServ";
867 >        target = "OperServ@service.example.net";
868 > };
869 >
870 > pseudo {
871 >        command = "OS";
872 >        name = "OperServ";
873 >        target = "OperServ@service.example.net";
874 > };
875 >
876 > pseudo {
877 >        command = "HOSTSERV";
878 >        name = "HostServ";
879 >        target = "HostServ@service.example.net";
880 > };
881 >
882 > pseudo {
883 >        command = "HS";
884 >        name = "HostServ";
885 >        target = "HostServ@service.example.net";
886 > };
887 >
888 > pseudo {
889 >        command = "BOTSERV";
890 >        name = "BotServ";
891 >        target = "BotServ@service.example.net";
892 > };
893 >
894 > pseudo {
895 >        command = "BS";
896 >        name = "BotServ";
897 >        target = "BotServ@service.example.net";
898 > };
899 >
900 > /*
901 > * channel {}:  the channel block contains options pertaining to channels
902   */
903   channel {
904          /*
905           * disable_fake_channels: this option, if set to 'yes', will
906 <         * disallow clients to create or join channels that have one
906 >         * disallow clients from creating or joining channels that have one
907           * of the following ASCII characters in their name:
908           *
909           *   2 | bold
# Line 781 | Line 917 | channel {
917          disable_fake_channels = yes;
918  
919          /*
920 <         * knock_delay: The amount of time a user must wait between issuing
921 <         * the knock command.
920 >         * invite_client_count, invite_client_time: how many INVITE commands
921 >         * are permitted per client per invite_client_time.
922           */
923 <        knock_delay = 5 minutes;
923 >        invite_client_count = 10;
924 >        invite_client_time = 5 minutes;
925  
926          /*
927 <         * knock_delay_channel: How often a knock to any specific channel
928 <         * is permitted, regardless of the user sending the knock.
927 >         * knock_client_count, knock_client_time: how many KNOCK commands
928 >         * are permitted per client per knock_client_time.
929           */
930 <        knock_delay_channel = 1 minute;
930 >        knock_client_count = 1;
931 >        knock_client_time = 5 minutes;
932  
933          /*
934 <         * max_chans_per_user: The maximum number of channels a user can
935 <         * join/be on.
934 >         * knock_delay_channel: how often a KNOCK to any specific channel
935 >         * is permitted, regardless of the user sending the KNOCK.
936           */
937 <        max_chans_per_user = 25;
937 >        knock_delay_channel = 1 minute;
938  
939          /*
940 <         * max_chans_per_oper: The maximum number of channels an oper can
941 <         * join/be on.
940 >         * max_channels: the maximum number of channels a user can join/be on.
941 >         * This is a default value which can be overriden with class {} blocks.
942           */
943 <        max_chans_per_oper = 50;
943 >        max_channels = 25;
944  
945 <        /* max_bans: maximum number of +b/e/I modes in a channel */
945 >        /* max_bans: maximum number of +b/e/I modes in a channel. */
946          max_bans = 100;
947  
948          /*
949 <         * how many joins in how many seconds constitute a flood, use 0 to
950 <         * disable. +b opers will be notified (changeable via /set)
951 <         */
952 <        join_flood_count = 16;
815 <        join_flood_time = 8 seconds;
816 <
817 <        /*
818 <         * splitcode: The ircd will now check splitmode every few seconds.
819 <         *
820 <         * Either split users or split servers can activate splitmode, but
821 <         * both conditions must be met for the ircd to deactivate splitmode.
822 <         *
823 <         * You may force splitmode to be permanent by /quote set splitmode on
824 <         */
825 <
826 <        /*
827 <         * default_split_user_count: when the usercount is lower than this level,
828 <         * consider ourselves split. This must be set for automatic splitmode.
949 >         * default_join_flood_count, default_join_flood_time:
950 >         * how many joins in how many seconds constitute a flood. Use 0 to disable.
951 >         * +b opers will be notified. These are only default values which can be
952 >         * changed via "/QUOTE SET JFLOODCOUNT" and "/QUOTE SET JFLOODTIME".
953           */
954 <        default_split_user_count = 0;
955 <
832 <        /*
833 <         * default_split_server_count: when the servercount is lower than this,
834 <         * consider ourselves split. This must be set for automatic splitmode.
835 <         */
836 <        default_split_server_count = 0;
837 <
838 <        /* no_create_on_split: disallow users creating channels on split. */
839 <        no_create_on_split = yes;
840 <
841 <        /* no_join_on_split: disallow users joining channels at all on a split. */
842 <        no_join_on_split = no;
954 >        default_join_flood_count = 18;
955 >        default_join_flood_time = 6 seconds;
956   };
957  
958   /*
959 < * serverhide {}:  The serverhide block contains the options regarding
960 < * serverhiding
959 > * serverhide {}:  the serverhide block contains the options regarding
960 > * to server hiding. For more information regarding server hiding,
961 > * please see doc/serverhide.txt
962   */
963   serverhide {
964          /*
965 <         * disable_remote_commands: disable users doing commands
965 >         * disable_remote_commands: disable users issuing commands
966           * on remote servers.
967           */
968          disable_remote_commands = no;
969  
970          /*
971           * flatten_links: this option will show all servers in /links appear
972 <         * that they are linked to this current server.
972 >         * as though they are linked to this current server.
973           */
974          flatten_links = no;
975  
# Line 879 | Line 993 | serverhide {
993  
994          /*
995           * hide_services: define this if you want to hide the location of
996 <         * services servers that are specified in the service{} block.
996 >         * services servers that are specified in the service {} block.
997           */
998          hide_services = no;
999  
1000          /*
1001 <         * Use this as the servername users see if hide_servers = yes.
1001 >         * hidden_name: use this as the servername users see if hide_servers = yes.
1002           */
1003 <        hidden_name = "*.hidden.com";
1003 >        hidden_name = "*.example.net";
1004  
1005          /*
1006 <         * hide_server_ips: If this is disabled, opers will be unable to see
1007 <         * servers ips and will be shown a masked ip, admins will be shown the
1008 <         * real ip.
1006 >         * hide_server_ips: if this is disabled, opers will be unable to see
1007 >         * servers' IP addresses and will be shown a masked IP address; admins
1008 >         * will be shown the real IP address.
1009           *
1010 <         * If this is enabled, nobody can see a servers ip. *This is a kludge*,
1011 <         * it has the side effect of hiding the ips everywhere, including
1012 <         * logfiles.
1010 >         * If this is enabled, nobody can see a server's IP address.
1011 >         * *This is a kludge*: it has the side effect of hiding the IP addresses
1012 >         * everywhere, including logfiles.
1013           *
1014           * We recommend you leave this disabled, and just take care with who you
1015           * give administrator privileges to.
# Line 904 | Line 1018 | serverhide {
1018   };
1019  
1020   /*
1021 < * general {}:  The general block contains many of the options that were once
1021 > * general {}:  the general block contains many of the options that were once
1022   * compiled in options in config.h
1023   */
1024   general {
1025 <        /* services_name: servername of nick/channel services */
1026 <        services_name = "service.someserver";
1025 >        /*
1026 >         * cycle_on_host_change: sends a fake QUIT/JOIN combination
1027 >         * when services change the hostname of a specific client.
1028 >         */
1029 >        cycle_on_host_change = yes;
1030  
1031          /* max_watch: maximum WATCH entries a client can have. */
1032 <        max_watch = 60;
1032 >        max_watch = 30;
1033  
1034 <        /* gline_enable: enable glines, network wide temp klines. */
1035 <        gline_enable = yes;
1034 >        /* max_accept: maximum allowed /accept's for +g user mode. */
1035 >        max_accept = 30;
1036  
1037          /*
1038 <         * gline_duration: the amount of time a gline will remain on your
1039 <         * server before expiring.
1038 >         * dline_min_cidr: the minimum required length of a CIDR bitmask
1039 >         * for IPv4 based D-lines.
1040           */
1041 <        gline_duration = 1 day;
1041 >        dline_min_cidr = 16;
1042  
1043          /*
1044 <         * gline_request_duration: how long a pending G-line can be around.
1045 <         * 10 minutes should be plenty.
1044 >         * dline_min_cidr6: the minimum required length of a CIDR bitmask
1045 >         * for IPv6 based D-lines.
1046           */
1047 <        gline_request_duration = 10 minutes;
1047 >        dline_min_cidr6 = 48;
1048  
1049          /*
1050 <         * gline_min_cidr: the minimum required length of a CIDR bitmask
1051 <         * for IPv4 based glines.
1050 >         * kline_min_cidr: the minimum required length of a CIDR bitmask
1051 >         * for IPv4 based K-lines.
1052           */
1053 <        gline_min_cidr = 16;
1053 >        kline_min_cidr = 16;
1054  
1055          /*
1056 <         * gline_min_cidr6: the minimum required length of a CIDR bitmask
1057 <         * for IPv6 based glines.
1056 >         * kline_min_cidr6: the minimum required length of a CIDR bitmask
1057 >         * for IPv6 based K-lines.
1058           */
1059 <        gline_min_cidr6 = 48;
1059 >        kline_min_cidr6 = 48;
1060  
1061          /*
1062 <         * Whether to automatically set mode +i on connecting users.
1062 >         * invisible_on_connect: whether to automatically set mode +i on
1063 >         * connecting users.
1064           */
1065          invisible_on_connect = yes;
1066  
1067          /*
1068 <         * kill_chase_time_limit: maximum time from the nickname change that
1069 <         * still causes KILL automatically to switch for the current nick of
1070 <         * that user.
1068 >         * kill_chase_time_limit: KILL chasing is a feature whereby a KILL
1069 >         * issued for a user who has recently changed nickname will be applied
1070 >         * automatically to the new nick. kill_chase_time_limit is the maximum
1071 >         * time following a nickname change that this chasing will apply.
1072           */
1073 <        kill_chase_time_limit = 90 seconds;
1073 >        kill_chase_time_limit = 30 seconds;
1074  
1075          /*
1076 <         * hide_spoof_ips: if disabled, opers will be allowed to see the real
1077 <         * IP of spoofed users in /trace etc. If this is defined they will be
1078 <         * shown a masked IP.
960 <         */
961 <        hide_spoof_ips = yes;
962 <
963 <        /*
964 <         * Ignore bogus timestamps from other servers. Yes, this will desync the
965 <         * network, but it will allow chanops to resync with a valid non TS 0
1076 >         * ignore_bogus_ts: ignore bogus timestamps from other servers.
1077 >         * Yes, this will desync the network, but it will allow chanops
1078 >         * to resync with a valid non TS 0.
1079           *
1080           * This should be enabled network wide, or not at all.
1081           */
# Line 970 | Line 1083 | general {
1083  
1084          /*
1085           * disable_auth: completely disable ident lookups; if you enable this,
1086 <         * be careful of what you set need_ident to in your auth {} blocks
1086 >         * be careful of what you set need_ident to in your auth {} blocks.
1087           */
1088          disable_auth = no;
1089  
# Line 982 | Line 1095 | general {
1095  
1096          /*
1097           * default_floodcount: the default value of floodcount that is configurable
1098 <         * via /quote set floodcount. This is the amount of lines a user
1099 <         * may send to any other user/channel in one second.
1098 >         * via /quote set floodcount. This is the number of lines a user may send
1099 >         * to any other user/channel in one second. Set to 0 to disable.
1100           */
1101          default_floodcount = 10;
1102  
1103          /*
1104 <         * failed_oper_notice: send a notice to all opers on the server when
1104 >         * failed_oper_notice: send a notice to all opers on the server when
1105           * someone tries to OPER and uses the wrong password, host or ident.
1106           */
1107          failed_oper_notice = yes;
1108  
1109          /*
1110 <         * dots_in_ident: the amount of '.' characters permitted in an ident
1110 >         * dots_in_ident: the number of '.' characters permitted in an ident
1111           * reply before the user is rejected.
1112           */
1113          dots_in_ident = 2;
1114  
1115          /*
1116 <         * min_nonwildcard: the minimum non wildcard characters in k/d/g lines
1117 <         * placed via the server. K-lines hand placed are exempt from limits.
1118 <         * Wildcard chars: '.', ':', '*', '?', '@', '!'
1116 >         * min_nonwildcard: the minimum number of non-wildcard characters in
1117 >         * k/d lines placed via the server. K-lines hand-placed are exempt from
1118 >         * this limit.
1119 >         * Wildcard characters: '.', ':', '*', '?'
1120           */
1121          min_nonwildcard = 4;
1122  
1123          /*
1124 <         * min_nonwildcard_simple: the minimum non wildcard characters in
1125 <         * gecos bans. Wildcard chars: '*', '?'
1124 >         * min_nonwildcard_simple: the minimum number of non-wildcard characters
1125 >         * in gecos bans. Wildcard characters: '*', '?'
1126           */
1127          min_nonwildcard_simple = 3;
1128  
1015        /* max_accept: maximum allowed /accept's for +g usermode. */
1016        max_accept = 20;
1017
1129          /* anti_nick_flood: enable the nickflood control code. */
1130          anti_nick_flood = yes;
1131  
1132 <        /* nick flood: the nick changes allowed in the specified period */
1133 <        max_nick_time = 20 seconds;
1132 >        /*
1133 >         * max_nick_changes, max_nick_time: the number of nick changes allowed in
1134 >         * the specified period.
1135 >         */
1136          max_nick_changes = 5;
1137 +        max_nick_time = 20 seconds;
1138 +
1139 +        /*
1140 +         * away_count, away_time: how many AWAY command are permitted per
1141 +         * client per away_time.
1142 +         */
1143 +        away_count = 2;
1144 +        away_time = 10 seconds;
1145  
1146          /*
1147           * anti_spam_exit_message_time: the minimum time a user must be connected
# Line 1029 | Line 1150 | general {
1150          anti_spam_exit_message_time = 5 minutes;
1151  
1152          /*
1153 <         * ts delta: the time delta allowed between server clocks before
1154 <         * a warning is given, or before the link is dropped. All servers
1155 <         * should run ntpdate/rdate to keep clocks in sync
1153 >         * ts_warn_delta, ts_max_delta: the time delta allowed between server
1154 >         * clocks before a warning is given, or before the link is dropped.
1155 >         * All servers should run ntpdate/rdate to keep clocks in sync.
1156           */
1157 <        ts_warn_delta = 30 seconds;
1158 <        ts_max_delta = 5 minutes;
1157 >        ts_warn_delta = 3 seconds;
1158 >        ts_max_delta = 15 seconds;
1159  
1160          /*
1161 <         * warn_no_nline: warn opers about servers that try to connect but
1162 <         * we don't have a connect {} block for. Twits with misconfigured
1163 <         * servers can get really annoying with this enabled.
1161 >         * warn_no_connect_block: warn opers about servers that try to connect
1162 >         * but for which we don't have a connect {} block. Twits with
1163 >         * misconfigured servers can become really annoying with this enabled.
1164           */
1165 <        warn_no_nline = yes;
1165 >        warn_no_connect_block = yes;
1166  
1167          /*
1168           * stats_e_disabled: set this to 'yes' to disable "STATS e" for both
1169           * operators and administrators. Doing so is a good idea in case
1170 <         * there are any exempted (exempt{}) server IPs you don't want to
1170 >         * there are any exempted (exempt {}) server IPs you don't want to
1171           * see leaked.
1172           */
1173          stats_e_disabled = no;
1174  
1175 <        /* stats_o_oper only: make stats o (opers) oper only */
1175 >        /* stats_m_oper_only: make /stats m/M (messages) oper only. */
1176 >        stats_m_oper_only = yes;
1177 >
1178 >        /* stats_o_oper_only: make stats o (opers) oper only. */
1179          stats_o_oper_only = yes;
1180  
1181 <        /* stats_P_oper_only: make stats P (ports) oper only */
1181 >        /* stats_P_oper_only: make stats P (ports) oper only. */
1182          stats_P_oper_only = yes;
1183  
1184 +        /* stats_u_oper_only: make stats u (uptime) oper only. */
1185 +        stats_u_oper_only = no;
1186 +
1187          /*
1188 <         * stats i oper only: make stats i (auth {}) oper only. Set to:
1189 <         *     yes    - show users no auth blocks, made oper only.
1190 <         *     masked - show users first matching auth block
1191 <         *     no     - show users all auth blocks.
1188 >         * stats_i_oper_only: make stats i (auth {}) oper only. Set to:
1189 >         *     yes    - show users no auth {} blocks, made oper only
1190 >         *     masked - show users the first matching auth {} block
1191 >         *     no     - show users all auth {} blocks
1192           */
1193          stats_i_oper_only = yes;
1194  
1195          /*
1196           * stats_k_oper_only: make stats k/K (klines) oper only. Set to:
1197 <         *     yes    - show users no auth blocks, made oper only
1198 <         *     masked - show users first matching auth block
1199 <         *     no     - show users all auth blocks.
1197 >         *     yes    - show users no klines, made oper only
1198 >         *     masked - show users the first matching kline
1199 >         *     no     - show users all klines
1200           */
1201          stats_k_oper_only = yes;
1202  
# Line 1081 | Line 1208 | general {
1208  
1209          /*
1210           * opers_bypass_callerid: allows operators to bypass +g and message
1211 <         * anyone who has it set (useful if you use services).
1211 >         * anyone who has it set.
1212           */
1213          opers_bypass_callerid = no;
1214  
1215          /*
1216 <         * pace_wait_simple: time between use of less intensive commands
1217 <         * (ADMIN, HELP, (L)USERS, VERSION, remote WHOIS)
1216 >         * pace_wait_simple: minimum time required between use of less
1217 >         * intensive commands
1218 >         * (ADMIN, HELP, LUSERS, VERSION, remote WHOIS)
1219           */
1220          pace_wait_simple = 1 second;
1221  
1222          /*
1223 <         * pace_wait: time between more intensive commands
1224 <         * (AWAY, INFO, LINKS, MAP, MOTD, STATS, WHO, wildcard WHOIS, WHOWAS)
1223 >         * pace_wait: minimum time required between use of more intensive commands
1224 >         * (INFO, LINKS, MAP, MOTD, STATS, WHO, WHOWAS)
1225           */
1226          pace_wait = 10 seconds;
1227  
1228          /*
1229 <         * short_motd: send clients a notice telling them to read the motd
1230 <         * instead of forcing a motd to clients who may simply ignore it.
1229 >         * short_motd: send clients a notice telling them to read the MOTD
1230 >         * instead of forcing an MOTD to clients who may simply ignore it.
1231           */
1232          short_motd = no;
1233  
1234          /*
1235 <         * ping_cookie: require clients to respond exactly to a ping command,
1235 >         * ping_cookie: require clients to respond exactly to a PING command,
1236           * can help block certain types of drones and FTP PASV mode spoofing.
1237           */
1238          ping_cookie = no;
# Line 1113 | Line 1241 | general {
1241          no_oper_flood = yes;
1242  
1243          /*
1244 <         * true_no_oper_flood: completely eliminate flood limits for opers
1117 <         * and for clients with can_flood = yes in their auth {} blocks.
1118 <         */
1119 <        true_no_oper_flood = yes;
1120 <
1121 <        /* oper_pass_resv: allow opers to over-ride RESVs on nicks/channels. */
1122 <        oper_pass_resv = yes;
1123 <
1124 <        /* REMOVE ME.  The following line checks you've been reading. */
1125 <        havent_read_conf = 1;
1126 <
1127 <        /*
1128 <         * max_targets: the maximum amount of targets in a single
1244 >         * max_targets: the maximum number of targets in a single
1245           * PRIVMSG/NOTICE. Set to 999 NOT 0 for unlimited.
1246           */
1247          max_targets = 4;
1248  
1249          /*
1250 <         * usermodes configurable: a list of usermodes for the options below
1250 >         * user modes configurable: a list of user modes for the options below
1251           *
1252           * +b - bots         - See bot and drone flooding notices
1253           * +c - cconn        - Client connection/quit notices
# Line 1139 | Line 1255 | general {
1255           * +d - debug        - See debugging notices
1256           * +e - external     - See remote server connection and split notices
1257           * +F - farconnect   - Remote client connection/quit notices
1258 <         * +f - full         - See auth{} block full notices
1258 >         * +f - full         - See auth {} block full notices
1259           * +G - softcallerid - Server Side Ignore for users not on your channels
1260           * +g - callerid     - Server Side Ignore (for privmsgs etc)
1261           * +H - hidden       - Hides operator status to other users
1262 <         * +i - invisible    - Not shown in NAMES or WHO unless you share a
1147 <         *                     a channel
1262 >         * +i - invisible    - Not shown in NAMES or WHO unless you share a channel
1263           * +j - rej          - See rejected client notices
1264           * +k - skill        - See server generated KILL messages
1265           * +l - locops       - See LOCOPS messages
1266           * +n - nchange      - See client nick changes
1267 +         * +p - hidechans    - Hides channel list in WHOIS
1268 +         * +q - hideidle     - Hides idle and signon time in WHOIS
1269           * +R - nononreg     - Only receive private messages from registered clients
1270           * +s - servnotice   - See general server notices
1271           * +u - unauth       - See unauthorized client notices
1272           * +w - wallop       - See server generated WALLOPS
1273           * +y - spy          - See LINKS, STATS, TRACE notices etc.
1157         * +z - operwall     - See oper generated WALLOPS
1274           */
1275  
1276 <        /* oper_only_umodes: usermodes only opers may set */
1277 <        oper_only_umodes = bots, cconn, debug, full, hidden, skill,
1278 <                           nchange, rej, spy, external, operwall,
1163 <                           locops, unauth, farconnect;
1164 <
1165 <        /* oper_umodes: default usermodes opers get when they /oper */
1166 <        oper_umodes = bots, locops, servnotice, operwall, wallop;
1276 >        /* oper_only_umodes: user modes only operators may set. */
1277 >        oper_only_umodes = bots, cconn, debug, external, farconnect, full, hidden, locops,
1278 >                        nchange, rej, skill, spy, unauth;
1279  
1280 <        /*
1281 <         * use_egd: if your system does not have *random devices yet you
1170 <         * want to use OpenSSL and encrypted links, enable this. Beware -
1171 <         * EGD is *very* CPU intensive when gathering data for its pool.
1172 <         */
1173 < #       use_egd = yes;
1280 >        /* oper_umodes: default user modes operators get when they /oper. */
1281 >        oper_umodes = bots, locops, servnotice, wallop;
1282  
1283          /*
1284 <         * egdpool_path: path to EGD pool. Not necessary for OpenSSL >= 0.9.7
1285 <         * which automatically finds the path.
1284 >         * throttle_count: the maximum number of connections from the same
1285 >         * IP address allowed in throttle_time duration.
1286           */
1287 < #       egdpool_path = "/var/run/egd-pool";
1287 >        throttle_count = 1;
1288  
1289          /*
1290 <         * throttle_time: the minimum amount of time between connections from
1291 <         * the same ip. exempt {} blocks are excluded from this throttling.
1290 >         * throttle_time: the minimum amount of time required between
1291 >         * connections from the same IP address. exempt {} blocks are
1292 >         * excluded from this throttling.
1293           * Offers protection against flooders who reconnect quickly.
1294           * Set to 0 to disable.
1295           */
1296 <        throttle_time = 10;
1296 >        throttle_time = 2 seconds;
1297   };
1298  
1299   modules {
# Line 1192 | Line 1301 | modules {
1301           * path: other paths to search for modules specified below
1302           * and in "/module load".
1303           */
1304 <        path = "/usr/local/ircd/lib/ircd-hybrid/modules";
1305 <        path = "/usr/local/ircd/lib/ircd-hybrid/modules/autoload";
1304 >        path = "lib/ircd-hybrid/modules";
1305 > #       path = "lib/ircd-hybrid/modules/extra";
1306 >        path = "lib/ircd-hybrid/modules/autoload";
1307  
1308          /* module: the name of a module to load on startup/rehash. */
1309   #       module = "some_module.la";
# Line 1208 | Line 1318 | log {
1318  
1319          file {
1320                  type = oper;
1321 <                name = "/usr/local/ircd/var/log/oper.log";
1321 >                name = "var/log/oper.log";
1322                  size = unlimited;
1323          };
1324  
1325          file {
1326                  type = user;
1327 <                name = "/usr/local/ircd/var/log/user.log";
1327 >                name = "var/log/user.log";
1328                  size = 50 megabytes;
1329          };
1330  
1331          file {
1332                  type = kill;
1333 <                name = "/usr/local/ircd/var/log/kill.log";
1333 >                name = "var/log/kill.log";
1334                  size = 50 megabytes;
1335          };
1336  
1337          file {
1338                  type = kline;
1339 <                name = "/usr/local/ircd/var/log/kline.log";
1339 >                name = "var/log/kline.log";
1340                  size = 50 megabytes;
1341          };
1342  
1343          file {
1344                  type = dline;
1345 <                name = "/usr/local/ircd/var/log/dline.log";
1345 >                name = "var/log/dline.log";
1346 >                size = 50 megabytes;
1347 >        };
1348 >
1349 >        file {
1350 >                type = xline;
1351 >                name = "var/log/xline.log";
1352                  size = 50 megabytes;
1353          };
1354  
1355          file {
1356 <                type = gline;
1357 <                name = "/usr/local/ircd/var/log/gline.log";
1356 >                type = resv;
1357 >                name = "var/log/resv.log";
1358                  size = 50 megabytes;
1359          };
1360  
1361          file {
1362                  type = debug;
1363 <                name = "/usr/local/ircd/var/log/debug.log";
1363 >                name = "var/log/debug.log";
1364                  size = 50 megabytes;
1365          };
1366   };

Diff Legend

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