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

Comparing:
ircd-hybrid-8/doc/example.conf (file contents), Revision 1412 by michael, Sat May 19 18:39:17 2012 UTC vs.
ircd-hybrid/branches/8.2.x/doc/reference.conf (file contents), Revision 5005 by michael, Tue Dec 9 14:19:40 2014 UTC

# Line 1 | Line 1
1 < /* doc/example.conf - ircd-hybrid-8 Example configuration file
2 < * Copyright (C) 2000-2012 Hybrid Development Team
1 > /*
2 > * This is an example configuration file for ircd-hybrid
3   *
4 < * Written by ejb, wcampbel, db, leeh and others
5 < * Other example configurations can be found in the source dir under
6 < * etc/.
4 > * Copyright (c) 2000-2014 ircd-hybrid development team
5   *
6   * $Id$
7   */
8  
9 < /* IMPORTANT NOTES:
9 > /*
10 > * ########################################################################
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   *
18   * Shell style (#), C++ style (//) and C style comments are supported.
19   *
# Line 22 | Line 23
23   *
24   * Times/durations are written as:
25   *        12 hours 30 minutes 1 second
26 < *        
26 > *
27   * Valid units of time:
28 < *        month, week, day, hour, minute, second
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.  
33 < */
34 <
35 < /* EFNET NOTE:
36 < *
37 < * This config file is NOT suitable for EFNet.  EFNet admins should use
38 < * example.efnet.conf
33 > * Sizes and times may be singular or plural.
34   */
35 <
35 >
36 >
37   /*
38   * serverinfo {}:  contains information about the server
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 <         * NOTE: The letters must be capitalized.  This cannot be changed at runtime.
50 >         *
51 >         * NOTE: The letters must be capitalized. This cannot be changed at runtime.
52           */
53 <        sid = "_CHANGE_ME_";
53 >        sid = "0HY";
54  
55          /*
56 <         * description: the description of the server.  '[' and ']' may not
60 <         * be used here for compatibility with older servers.
56 >         * description: the description of the server.
57           */
58 <        description = "hybrid-7 test server";
58 >        description = "ircd-hybrid test server";
59  
60          /*
61           * network info: the name and description of the network this server
62 <         * is on.  Shown in the 005 reply and used with serverhiding.
62 >         * is on. Shown in the 005 reply and used with serverhiding.
63           */
64          network_name = "MyNet";
65          network_desc = "This is My Network";
# Line 78 | Line 74 | serverinfo {
74           * vhost: the IP to bind to when we connect outward to ipv4 servers.
75           * This should be an ipv4 IP only, or "*" for INADDR_ANY.
76           */
77 <        #vhost = "192.169.0.1";
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";
83 > #       vhost6 = "3ffe:80e8:546::2";
84  
85 <        /* max_clients: the maximum number of clients allowed to connect */
85 >        /* max_clients: the maximum number of clients allowed to connect. */
86          max_clients = 512;
87  
88          /*
89 <         * rsa_private_key_file: the path to the file containing our
90 <         * rsa key for cryptlink.
89 >         * max_nick_length: only applies to local clients. Must be in the
90 >         * range of 9 to 30. Default is 9 if nothing else is specified.
91 >         */
92 >        max_nick_length = 9;
93 >
94 >        /*
95 >         * max_topic_length: only applies to topics set by local clients.
96 >         * Must be in the range of 80 to 300. Default is 80 if nothing
97 >         * else is specified.
98 >         */
99 >        max_topic_length = 160;
100 >
101 >        /*
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           *
96         * Example command to store a 2048 bit RSA keypair in
97         * rsa.key, and the public key in rsa.pub:
98         *
107           *      openssl genrsa -out rsa.key 2048
108 <         *      openssl rsa -in rsa.key -pubout -out rsa.pub
101 <         *      chown <ircd-user>.<ircd.group> rsa.key rsa.pub
108 >         *      chown <ircd-user>.<ircd.group> rsa.key
109           *      chmod 0600 rsa.key
103         *      chmod 0644 rsa.pub
110           */
111 <        #rsa_private_key_file = "/usr/local/ircd/etc/rsa.key";
111 > #       rsa_private_key_file = "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
118 >         * MUST have an RSA key in order to generate the certificate.
119 >         *
120 >         * Example command:
121           *
122           *      openssl req -new -days 365 -x509 -key rsa.key -out cert.pem
123           *
# Line 122 | Line 130 | serverinfo {
130           *      Common Name: irc.someirc.net
131           *      E-mail: you@domain.com
132           */
133 <        #ssl_certificate_file = "/usr/local/ircd/etc/cert.pem";
126 <
133 > #       ssl_certificate_file = "etc/cert.pem";
134  
135          /*
136 <         * ssl_dh_param_file:
137 <         *
138 <         * Path to the PEM encoded Diffie-Hellman parameter file.
132 <         * DH parameters are strictly required when using ciphers
133 <         * with EDH (ephemeral Diffie-Hellman) key exchange.
136 >         * ssl_dh_param_file: path to the PEM encoded Diffie-Hellman
137 >         * parameter file. DH parameters are required when using
138 >         * ciphers with EDH (ephemeral Diffie-Hellman) key exchange.
139           *
140           * A DH parameter file can be created by running:
141           *
142 <         *      openssl dhparam -out dhparam.pem 1024
142 >         *      openssl dhparam -out dhparam.pem 2048
143           *
144 <         * Further information regarding specific OpenSSL dhparam
145 <         * command-line options can be found in the OpenSSL manual.
144 >         * Prime size must be at least 1024 bits. Further information
145 >         * regarding specific OpenSSL dhparam command-line options
146 >         * can be found in the OpenSSL manual.
147           */
148 <        #ssl_dh_param_file = "/usr/local/ircd/etc/dhparam.pem";
148 > #       ssl_dh_param_file = "etc/dhparam.pem";
149  
150          /*
151 <         * ssl_cipher_list:
151 >         * ssl_dh_elliptic_curve: defines the curve to use for the
152 >         * Elliptic Curve Diffie-Hellman (ECDH) algorithm.
153 >         * Default is ANSI X9.62 prime256v1/secp256r1 if nothing else is specified.
154           *
155 <         * List of ciphers that are supported by _this_ server. Can be used to enforce
148 <         * specific ciphers for incoming SSL/TLS connections.
149 <         * If a client (which also includes incoming server connections) isn't capable
150 <         * of any cipher listed below, the connection will simply be rejected.
155 >         * A list of supported curves by OpenSSL can be obtained by running:
156           *
157 <         * A list of supported ciphers can be obtained by running:
157 >         *      openssl ecparam -list_curves
158 >         */
159 > #       ssl_dh_elliptic_curve = "secp521r1";
160 >
161 >        /*
162 >         * ssl_cipher_list: list of ciphers to support on _this_ server.
163 >         * Can be used to enforce specific ciphers for incoming SSL/TLS
164 >         * connections. If a client (which also includes incoming server connections)
165 >         * is not capable of using any of the ciphers listed here, the connection will
166 >         * simply be rejected.
167 >         *
168 >         * A list of supported ciphers by OpenSSL can be obtained by running:
169           *
170           *      openssl ciphers -ssl3 -tls1 -v
171           *
172 <         * Multiple ciphers are separated by colons. The order of preference is from
173 <         * left to right.
172 >         * Multiple ciphers are separated by colons. The order of preference is
173 >         * from left to right.
174           */
175 <        #ssl_cipher_list = "DHE-RSA-AES256-SHA:AES256-SHA";
175 > #       ssl_cipher_list = "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA:AES256-SHA";
176  
177          /*
178 <         * ssl_server_method:
179 <         * ssl_client_method:
178 >         * ssl_message_digest_algorithm: defines what cryptographic hash function
179 >         * to use for generating fingerprint hashes of X.509 certificates.
180 >         * Default is SHA-256 if nothing else is specified.
181 >         *
182 >         * A list of supported message digest algorithms by OpenSSL can be obtained by running:
183           *
184 <         * SSL/TLS methods we provide for incoming (server method) and
166 <         * outgoing (client method) SSL/TLS connections.
167 <         * This can be either sslv3 for SSLv3, and/or tlsv1 for TLSv1.
168 <         * SSLv2 is not suppported.
184 >         *      openssl list-message-digest-algorithms
185           */
186 <        #ssl_server_method = tlsv1, sslv3;
171 <        #ssl_client_method = tlsv1;
186 > #       ssl_message_digest_algorithm = "sha256";
187   };
188  
189   /*
190 < * admin {}:  contains admin information about the server
190 > * admin {}:  contains administrative information about the server
191   */
192   admin {
193          name = "Smurf target";
# Line 184 | Line 199 | admin {
199   * class {}:  contains information about classes for users
200   */
201   class {
202 <        /* name: the name of the class.  classes are text now */
202 >        /* name: the name of the class. */
203          name = "users";
204  
205          /*
# Line 195 | Line 210 | class {
210  
211          /*
212           * number_per_ip: how many local users are allowed to connect
213 <         * from one IP  (optional)
213 >         * from a single IP address (optional)
214           */
215          number_per_ip = 2;
216  
217          /*
218           * max_local: how many local users are allowed to connect
219 <         * from one ident@host  (optional)
219 >         * from a single ident@host (optional)
220           */
221          max_local = 2;
222  
223          /*
224 <         * max_global: network-wide limit of users per ident@host  (optional)
224 >         * max_global: network-wide limit of users per ident@host (optional)
225           */
226          max_global = 10;
227  
# Line 216 | Line 231 | class {
231          max_number = 100;
232  
233          /*
234 <         * the following lines are optional and allow you to define
235 <         * how many users can connect from one /NN subnet
234 >         * The following lines are optional and allow you to define
235 >         * how many users can connect from one /NN subnet.
236           */
237          cidr_bitlen_ipv4 = 24;
238          cidr_bitlen_ipv6 = 120;
239          number_per_cidr = 16;
240  
241          /*
242 <         * sendq: the amount of data allowed in a clients queue before
242 >         * sendq: the amount of data allowed in a client's send queue before
243           * they are dropped.
244           */
245          sendq = 100 kbytes;
246 +
247 +        /*
248 +         * recvq: the amount of data allowed in a client's receive queue before
249 +         * they are dropped for flooding. Defaults to 2560 if the chosen value
250 +         * isn't within the range of 512 to 8000.
251 +         */
252 +        recvq = 2560 bytes;
253   };
254  
255   class {
# Line 235 | Line 257 | class {
257          ping_time = 90 seconds;
258          number_per_ip = 10;
259          max_number = 100;
260 <        sendq = 100kbytes;
260 >        sendq = 100 kbytes;
261 >
262 >        /*
263 >         * max_channels: maximum number of channels users in this class can join.
264 >         */
265 >        max_channels = 60;
266 >
267 >        /*
268 >         * min_idle: minimum idle time that is shown in /whois.
269 >         */
270 >        min_idle = 3 hours;
271 >
272 >        /*
273 >         * max_idle: maximum idle time that is shown in /whois.
274 >         */
275 >        max_idle = 8 hours;
276 >
277 >        /*
278 >         * flags:
279 >         *
280 >         * random_idle          - a fake idle time is set randomly between
281 >         *                        min_idle and max_idle
282 >         * hide_idle_from_opers - the fake idle time will also be shown to operators
283 >         */
284 >        flags = random_idle, hide_idle_from_opers;
285   };
286  
287   class {
# Line 243 | Line 289 | class {
289          ping_time = 90 seconds;
290  
291          /*
292 <         * ping_warning: how fast a server must reply to a PING before
247 <         * a warning to opers is generated.
248 <         */
249 <        ping_warning = 15 seconds;
250 <
251 <        /*
252 <         * connectfreq: only used in server classes.  Specifies the delay
292 >         * connectfreq: only used in server classes. Specifies the delay
293           * between autoconnecting to servers.
294           */
295          connectfreq = 5 minutes;
296  
297 <        /* max number: the amount of servers to autoconnect to */
297 >        /* max number: the number of servers to autoconnect to. */
298          max_number = 1;
299  
300 <        /* sendq: servers need a higher sendq as they send more data */
300 >        /* sendq: servers need a higher sendq as they send more data. */
301          sendq = 2 megabytes;
302   };
303  
304   /*
305 + * motd {}: Allows the display of a different MOTD to a client
306 + * depending on its origin. Applies to local users only.
307 + */
308 + motd {
309 +        /*
310 +         * mask: multiple mask entries are permitted. Mask can either be
311 +         * a class name or a hostname. CIDR is supported.
312 +         */
313 +        mask = "*.at";
314 +        mask = "*.de";
315 +        mask = "*.ch";
316 +
317 +        /*
318 +         * file: path to the actual motd file.
319 +         */
320 +        file = "etc/german.motd";
321 + };
322 +
323 + /*
324   * listen {}:  contains information about the ports ircd listens on
325   */
326   listen {
327          /*
328 <         * port: the specific port to listen on.  If no host is specified
329 <         * before, it will listen on all available IPs.
328 >         * port: the port to listen on. If no host is specified earlier
329 >         * in the listen {} block, it will listen on all available IPs.
330           *
331 <         * Ports are separated via a comma, a range may be specified using ".."
331 >         * Ports are separated by commas; a range may be specified using ".."
332           */
333 <        
334 <        /* port: listen on all available IPs, ports 6665 to 6669 */
333 >
334 >        /* port: listen on all available IP addresses, ports 6665 to 6669. */
335          port = 6665 .. 6669;
336  
337          /*
338 <         * Listen on 192.168.0.1/6697 with ssl enabled and hidden from STATS P
338 >         * Listen on 192.168.0.1/6697 with SSL enabled and hidden from STATS P
339           * unless you are an administrator.
340           *
341 <         * NOTE: The "flags" directive has to come before "port".  Always!
341 >         * NOTE: The "flags" directive always has to come before "port".
342           *
343           * Currently available flags are:
344           *
345 <         *  ssl    - Port is for SSL client connections only
345 >         *  ssl    - Port may only accept TLS/SSL connections
346           *  server - Only server connections are permitted
347           *  hidden - Port is hidden from /stats P, unless you're an admin
348           */
# Line 292 | Line 351 | listen {
351          port = 6697;
352  
353          /*
354 <         * host: set a specific IP/host the ports after the line will listen
355 <         * on.  This may be ipv4 or ipv6.
354 >         * host: set a specific IP address/host to listen on using the
355 >         * subsequent port definitions. This may be IPv4 or IPv6.
356           */
357          host = "1.2.3.4";
358          port = 7000, 7001;
# Line 307 | Line 366 | listen {
366   */
367   auth {
368          /*
369 <         * user: the user@host allowed to connect.  Multiple IPv4/IPv6 user
370 <         * lines are permitted per auth block.
369 >         * user: the user@host allowed to connect. Multiple user
370 >         * lines are permitted within each auth {} block.
371           */
372          user = "*@172.16.0.0/12";
373          user = "*test@123D:B567:*";
374  
375 <        /* password: an optional password that is required to use this block */
375 >        /* password: an optional password that is required to use this block. */
376          password = "letmein";
377  
378          /*
# Line 323 | Line 382 | auth {
382          encrypted = yes;
383  
384          /*
385 <         * spoof: fake the users host to this.  This is free-form,
386 <         * just do everyone a favor and don't abuse it. ('=' prefix on /stats I)
385 >         * spoof: fake the user's host to this. This is free-form, just do
386 >         * everyone a favor and don't abuse it. ('=' prefix on /stats I)
387           */
388          spoof = "I.still.hate.packets";
389  
390 <        /* class: the class the user is placed in */
390 >        /* class: the class the user is placed in. */
391          class = "opers";
392  
393          /*
394 <         * need_password - don't allow users who haven't supplied the correct
395 <         *                 password to connect using another auth{} block
396 <         *                 ('&' prefix on /stats I if disabled)
338 <         * need_ident    - require the user to have identd to connect ('+' prefix on /stats I)
394 >         * need_password - don't allow users who haven't supplied the correct  | ('&' prefix on /stats I if disabled)
395 >         *                 password to connect using another auth {} block
396 >         * need_ident    - require the user to have identd to connect          | ('+' prefix on /stats I)
397           * spoof_notice  - enable spoofing notification to admins
398 <         * exceed_limit  - allow a user to exceed class limits ('>' prefix on /stats I)
399 <         * kline_exempt  - exempt this user from k/glines ('^' prefix on /stats I)
400 <         * gline_exempt  - exempt this user from glines ('_' prefix on /stats I)
401 <         * resv_exempt   - exempt this user from resvs ('$' prefix on /stats I)
402 <         * no_tilde      - remove ~ from a user with no ident ('-' prefix on /stats I)
403 <         * can_flood     - allow this user to exceed flood limits ('|' prefix on /stats I)
398 >         * exceed_limit  - allow a user to exceed class limits                 | ('>' prefix on /stats I)
399 >         * kline_exempt  - exempt this user from k/glines                      | ('^' prefix on /stats I)
400 >         * gline_exempt  - exempt this user from glines                        | ('_' prefix on /stats I)
401 >         * resv_exempt   - exempt this user from resvs                         | ('$' prefix on /stats I)
402 >         * no_tilde      - remove ~ from a user with no ident                  | ('-' prefix on /stats I)
403 >         * can_flood     - allow this user to exceed flood limits              | ('|' prefix on /stats I)
404 >         * webirc        - enables WEBIRC authentication for web-based         | ('<' prefix on /stats I)
405 >         *                 clients such as Mibbit
406           */
407          flags = need_password, spoof_notice, exceed_limit, kline_exempt,
408                  gline_exempt, resv_exempt, no_tilde, can_flood;
# Line 350 | Line 410 | auth {
410  
411   auth {
412          /*
413 <         * redirect: the server and port to redirect a user to.  A user does
414 <         * not have to obey the redirection, the ircd just suggests an alternative
415 <         * server for them.
413 >         * redirserv, redirport: the server and port to redirect a user to.
414 >         * A user does not have to obey the redirection; the ircd just
415 >         * suggests an alternative server for them.
416           */
417 <        redirserv = "this.is.not.a.real.server";
417 >        redirserv = "server.tld";
418          redirport = 6667;
359        
360        user = "*.server";
419  
420 <        /* class: a class is required even though it is not used */
420 >        user = "*@*.tld";
421 >
422 >        /* class: a class is required even though it is not used. */
423          class = "users";
424   };
425  
# Line 371 | Line 431 | auth {
431  
432   /*
433   * operator {}:  defines ircd operators
374 *
375 * ircd-hybrid no longer supports local operators, privileges are
376 * controlled via flags.
434   */
435   operator {
436 <        /* name: the name of the oper */
437 <        name = "god";
436 >        /* name: the name of the operator */
437 >        name = "sheep";
438  
439          /*
440 <         * user: the user@host required for this operator. Multiple
441 <         * user="" lines are supported.
440 >         * user: the user@host required for this operator. Multiple user
441 >         * lines are permitted within each operator {} block.
442           */
443 <        user = "*god@192.168.0.0/16";
443 >        user = "*sheep@192.168.0.0/16";
444          user = "*@127.0.0.0/8";
445  
446          /*
447 <         * password: the password required to oper.  By default this will
447 >         * password: the password required to oper. By default this will
448           * need to be encrypted by using the provided mkpasswd tool.
449           * Several password hash algorithms are available depending
450           * on your system's crypt() implementation. For example, a modern
451 <         * glibc already has support for SHA-256/512, and MD5 encryption
451 >         * glibc already has support for the SHA-256/512 and MD5 encryption
452           * algorithms.
453           */
454          password = "$5$x5zof8qe.Yc7/bPp$5zIg1Le2Lsgd4CvOjaD20pr5PmcfD7ha/9b2.TaUyG4";
455  
456          /*
457           * encrypted: controls whether the oper password above has been
458 <         * encrypted.
458 >         * encrypted. Default is 'yes' if nothing else is specified.
459           */
460          encrypted = yes;
461  
462          /*
463 <         * rsa_public_key_file: the public key for this oper when using Challenge.
464 <         * A password should not be defined when this is used, see
463 >         * rsa_public_key_file: the public key for this oper when using /challenge.
464 >         * A password should not be defined when this is used; see
465           * doc/challenge.txt for more information.
466           */
467 < #       rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
467 > #       rsa_public_key_file = "etc/oper.pub";
468 >
469 >        /*
470 >         * ssl_certificate_fingerprint: enhances security by additionally checking
471 >         * the oper's client certificate fingerprint against the specified
472 >         * fingerprint below.
473 >         *
474 >         * Hint: your users can use the following command to obtain a SHA-256 hash
475 >         * of their ssl certificate:
476 >         *
477 >         *      openssl x509 -sha256 -noout -fingerprint -in cert.pem | sed -e 's/^.*=//;s/://g'
478 >         */
479 > #       ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D";
480  
481 <        /* class: the class the oper joins when they successfully /oper */
481 >        /*
482 >         * ssl_connection_required: client must be connected over SSL/TLS
483 >         * in order to be able to use this operator {} block.
484 >         * Default is 'no' if nothing else is specified.
485 >         */
486 >        ssl_connection_required = no;
487 >
488 >        /* class: the class the oper joins when they successfully /oper or /challenge. */
489          class = "opers";
490  
491          /*
492 <         * umodes: default usermodes opers get when they /oper.  If defined,
493 <         * it will override oper_umodes settings in general {}.
492 >         * umodes: the default usermodes opers get when they /oper or /challenge.
493 >         * If defined, it will override oper_umodes settings in general {}.
494           * Available usermodes:
495           *
496           * +b - bots         - See bot and drone flooding notices
497           * +c - cconn        - Client connection/quit notices
422         * +C - cconn_full   - Client connection/quit notices full
498           * +D - deaf         - Don't receive channel messages
499           * +d - debug        - See debugging notices
500 <         * +f - full         - See I: line full notices
500 >         * +e - external     - See remote server connection and split notices
501 >         * +F - farconnect   - Remote client connection/quit notices
502 >         * +f - full         - See auth {} block full notices
503           * +G - softcallerid - Server Side Ignore for users not on your channels
504           * +g - callerid     - Server Side Ignore (for privmsgs etc)
505           * +H - hidden       - Hides operator status to other users
506 <         * +i - invisible    - Not shown in NAMES or WHO unless you share a
430 <         *                     a channel
506 >         * +i - invisible    - Not shown in NAMES or WHO unless you share a channel
507           * +j - rej          - See rejected client notices
508           * +k - skill        - See server generated KILL messages
509           * +l - locops       - See LOCOPS messages
510           * +n - nchange      - See client nick changes
511 +         * +p - hidechans    - Hides channel list in WHOIS
512 +         * +q - hideidle     - Hides idle and signon time in WHOIS
513 +         * +R - nononreg     - Only receive private messages from registered clients
514           * +s - servnotice   - See general server notices
515           * +u - unauth       - See unauthorized client notices
516           * +w - wallop       - See server generated WALLOPS
438         * +x - external     - See remote server connection and split notices
517           * +y - spy          - See LINKS, STATS, TRACE notices etc.
440         * +z - operwall     - See oper generated WALLOPS
518           */
519 < #       umodes = locops, servnotice, operwall, wallop;
519 >        umodes = locops, servnotice, wallop;
520  
521          /*
522 <         * privileges: controls the activities and commands an oper is
523 <         * allowed to do on the server. All options default to no.
524 <         * Available options:
525 <         *
526 <         * module       - allows MODLIST, MODRESTART, MODLOAD, MODUNLOAD
527 <         * global_kill  - allows remote users to be /KILL'd
528 <         * remote       - allows remote SQUIT and CONNECT
529 <         * remoteban    - allows remote KLINE/UNKLINE
530 <         * dline        - allows DLINE
531 <         * undline      - allows UNDLINE
532 <         * kline        - allows KILL and KLINE
533 <         * unkline      - allows UNKLINE
534 <         * gline        - allows GLINE
535 <         * xline        - allows XLINE
536 <         * globops      - allows GLOBOPS
537 <         * operwall     - allows OPERWALL
538 <         * nick_changes - allows oper to see nickchanges via usermode +n
539 <         * rehash       - allows oper to REHASH config
540 <         * die          - allows DIE
541 <         * restart      - allows RESTART
542 <         * admin        - gives admin privileges. admins for example,
543 <         *                may see the real IP addresses of servers.
522 >         * privileges: controls the activities and commands an oper is
523 >         * allowed to do on the server. All flags default to 'no'.
524 >         * Available flags:
525 >         *
526 >         * admin          - gives administrator privileges    | ('A' flag)
527 >         * connect        - allows local CONNECT              | ('P' flag)
528 >         * connect:remote - allows remote CONNECT             | ('Q' flag)
529 >         * die            - allows DIE                        | ('D' flag)
530 >         * dline          - allows DLINE                      |
531 >         * gline          - allows GLINE                      | ('G' flag)
532 >         * globops        - allows GLOBOPS                    |
533 >         * kill           - allows to KILL local clients      | ('N' flag)
534 >         * kill:remote    - allows remote users to be /KILL'd | ('O' flag)
535 >         * kline          - allows KLINE                      | ('K' flag)
536 >         * locops         - allows LOCOPS                     |
537 >         * module         - allows MODULE                     |
538 >         * opme           - allows OPME                       |
539 >         * rehash         - allows oper to REHASH config      | ('H' flag)
540 >         * remoteban      - allows remote KLINE/UNKLINE       | ('B' flag)
541 >         * restart        - allows RESTART                    |
542 >         * set            - allows SET                        |
543 >         * squit          - allows local SQUIT                | ('R' flag)
544 >         * squit:remote   - allows remote SQUIT               | ('S' flag)
545 >         * undline        - allows UNDLINE                    |
546 >         * unkline        - allows UNKLINE                    | ('U' flag)
547 >         * unxline        - allows UNXLINE                    |
548 >         * wallops        - allows WALLOPS                    |
549 >         * xline          - allows XLINE                      | ('X' flag)
550           */
551 <        flags = global_kill, remote, kline, unkline, xline, globops, restart,
552 <                die, rehash, nick_changes, admin, operwall, module;
470 < };
471 <
472 < service {
473 <        name = "service.someserver";
474 <        name = "stats.someserver";
551 >        flags = admin, connect, connect:remote, die, globops, kill, kill:remote,
552 >                kline, module, rehash, restart, set, unkline, unxline, xline;
553   };
554  
555   /*
556 < * connect {}:  controls servers we connect to
556 > * connect {}: define a server to connect to
557   */
558   connect {
559 <        /* name: the name of the server */
559 >        /* name: the name of the server. */
560          name = "irc.uplink.com";
561  
562          /*
563 <         * host: the host or IP to connect to.  If a hostname is used it
564 <         * must match the reverse dns of the server.
563 >         * host: the host or IP address to connect to. If a hostname is used it
564 >         * must match the reverse DNS of the server.
565           */
566          host = "192.168.0.1";
567  
568          /*
569 <         * vhost: the IP to bind to when we connect outward to servers.
569 >         * vhost: the IP address to bind to when making outgoing connections to
570 >         * servers.
571           * serverinfo::vhost and serverinfo::vhost6 will be overridden
572           * by this directive.
573           */
574          vhost = "192.168.0.2";
575  
576          /*
577 <         * passwords: the passwords we send (OLD C:) and accept (OLD N:).
578 <         * The remote server will have these passwords reversed.
577 >         * send_password, accept_password: the passwords to send and accept.
578 >         * The remote server will have these passwords swapped.
579           */
580          send_password = "password";
581          accept_password = "anotherpassword";
# Line 507 | Line 586 | connect {
586           */
587          encrypted = no;
588  
589 <        /* port: the port to connect to this server on */
589 >        /* port: the port to connect to this server on. */
590          port = 6666;
591  
592          /*
593 <         * hub_mask: the mask of servers that this server may hub.  Multiple
594 <         * entries are permitted
593 >         * hub_mask: the mask of servers that this server may hub. Multiple
594 >         * entries are permitted.
595           */
596          hub_mask = "*";
597  
598          /*
599 <         * leaf_mask: the mask of servers this server may not hub.  Multiple
600 <         * entries are permitted.  Useful for forbidding EU -> US -> EU routes.
599 >         * leaf_mask: the mask of servers this server may not hub. Multiple
600 >         * entries are permitted. Useful for forbidding EU -> US -> EU routes.
601           */
602   #       leaf_mask = "*.uk";
603  
604 <        /* class: the class this server is in */
604 >        /* class: the class this server is in. */
605          class = "server";
606  
607 <        #ssl_cipher_list = "DHE-RSA-AES256-SHA:AES256-SHA";
607 >        /*
608 >         * ssl_cipher_list: list of ciphers that the server we are connecting to
609 >         * must support. If the server is not capable of using any of the ciphers
610 >         * listed below, the connection will simply be rejected.
611 >         * Can be used to enforce stronger ciphers, even though this option
612 >         * is not necessarily required to establish a SSL/TLS connection.
613 >         *
614 >         * Multiple ciphers are separated by colons. The order of preference
615 >         * is from left to right.
616 >         */
617 > #       ssl_cipher_list = "ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA:AES256-SHA";
618 >
619 >        /*
620 >         * ssl_certificate_fingerprint: enhances security by additionally checking
621 >         * the server's client certificate fingerprint against the specified
622 >         * fingerprint below.
623 >         */
624 > #       ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D";
625  
626          /*
627           * autoconn   - controls whether we autoconnect to this server or not,
628           *              dependent on class limits. By default, this is disabled.
533         * burst_away - This will send the /away string that users have set
534         *              on the server burst. Note this can be a lot of data
535         *              and slow down your server burst.
536         * topicburst - Send topics to this server during channel burst. Works
537         *              only if the server we are connecting to is capable
538         *              of TBURST/TB.
629           * ssl        - Initiates a TLS/SSL connection.
630           */
631 < #       flags = autoconn, burst_away, topicburst;
631 > #       flags = autoconn, ssl;
632   };
633  
634   connect {
# Line 562 | Line 652 | connect {
652   */
653   cluster {
654          /*
655 <         * name: the server to share with, this can take wildcards
655 >         * name: the server to share with; this can take wildcards
656           *
657 <         * NOTE: only local actions will be clustered, meaning if
657 >         * NOTE: only local actions will be clustered, meaning that if
658           *       the server receives a shared kline/unkline/etc, it
659           *       will not be propagated to clustered servers.
660           *
661           *       Remote servers are not necessarily required to accept
662 <         *       clustered lines, they need a shared{} for *THIS* server
663 <         *       in order to accept them.
662 >         *       clustered lines, they need a shared {} block for *THIS*
663 >         *       server in order to accept them.
664           */
665          name = "*.arpa";
666  
667          /*
668 <         * type: list of what to share, options are as follows:
668 >         * type: list of what to share; options are as follows:
669           *      dline   - share dlines
670           *      undline - share undlines
671           *      kline   - share klines
# Line 593 | Line 683 | cluster {
683   /*
684   * shared {}: users that are allowed to remote kline
685   *
686 < * NOTE: This can be effectively used for remote klines.
686 > * NOTE: This can effectively be used for remote klines.
687   *       Please note that there is no password authentication
688 < *       for users setting remote klines.  You must also be
688 > *       for users setting remote klines. You must also be
689   *       /oper'd in order to issue a remote kline.
690   */
691   shared {
692          /*
693 <         * name: the server the user must be on to set klines.  If this is not
694 <         * specified, the user will be allowed to kline from all servers.
693 >         * name: the server the user must be connected to in order to set klines.
694 >         * If this is not specified, the user will be allowed to kline from all
695 >         * servers.
696           */
697          name = "irc2.some.server";
698  
699          /*
700 <         * user: the user@host mask that is allowed to set klines.  If this is
700 >         * user: the user@host mask that is allowed to set klines. If this is
701           * not specified, all users on the server above will be allowed to set
702           * a remote kline.
703           */
# Line 630 | Line 721 | shared {
721  
722   /*
723   * kill {}:  users that are not allowed to connect
724 < * Oper issued klines will be added to the specified kline config
724 > * Oper issued klines will be added to the specified kline database
725   */
726   kill {
727          user = "bad@*.hacked.edu";
728          reason = "Obviously hacked account";
729   };
730  
640 kill {
641        user = "^O[[:alpha:]]?[[:digit:]]+(x\.o|\.xo)$@^[[:alnum:]]{4}\.evilnet.tld$";
642
643        /*
644         * NOTE: You have to set type=regex; when using a regular expression
645         * based user entry
646         */
647        type = regex;
648 };
649
731   /*
732 < * deny {}:  IPs that are not allowed to connect (before DNS/ident lookup)
733 < * Oper issued dlines will be added to the specified dline config
732 > * deny {}:  IP addresses that are not allowed to connect
733 > * (before DNS/ident lookup)
734 > * Oper issued dlines will be added to the specified dline database
735   */
736   deny {
737          ip = "10.0.1.0/24";
# Line 657 | Line 739 | deny {
739   };
740  
741   /*
742 < * exempt {}: IPs that are exempt from deny {} and Dlines
742 > * exempt {}:  IP addresses that are exempt from deny {} and Dlines
743   */
744   exempt {
745          ip = "192.168.0.0/16";
# Line 666 | Line 748 | exempt {
748   /*
749   * resv {}:  nicks and channels users may not use/join
750   */
751 + resv { mask = "clone*"; reason = "Clone bots"; };
752 + resv { mask = "Global"; reason = "Reserved for services"; };
753 + resv { mask = "ChanServ"; reason = "Reserved for services"; };
754 + resv { mask = "NickServ"; reason = "Reserved for services"; };
755 + resv { mask = "OperServ"; reason = "Reserved for services"; };
756 + resv { mask = "MemoServ"; reason = "Reserved for services"; };
757 + resv { mask = "BotServ"; reason = "Reserved for services"; };
758 + resv { mask = "HelpServ"; reason = "Reserved for services"; };
759 + resv { mask = "HostServ"; reason = "Reserved for services"; };
760 + resv { mask = "StatServ"; reason = "Reserved for services"; };
761 + resv { mask = "#*services*"; reason = "Reserved for services"; };
762 +
763   resv {
764 <        /* reason: the reason for the proceeding resv's */
765 <        reason = "Reserved for services";
764 >        /*
765 >         * mask: masks starting with a '#' are automatically considered
766 >         * as channel name masks.
767 >         */
768 >        mask = "#helsinki";
769 >        reason = "Channel is reserved for Finnish inhabitants";
770  
771 <        /* resv: the nicks and channels users may not join/use */
772 <        nick = "Global";
773 <        nick = "DevNull";
774 <        nick = "Services";
775 <        nick = "StatServ";
776 <        nick = "HostServ";
679 <        nick = "NickServ";
680 <        nick = "ChanServ";
681 <        nick = "MemoServ";
682 <        nick = "OperServ";
683 <        channel = "#services";
684 <
685 <        /* resv: wildcard masks are also supported in nicks only */
686 <        reason = "Clone bots";
687 <        nick = "clone*";
771 >        /*
772 >         * exempt: can be either a ISO 3166 alpha-2 two letter country
773 >         * code, or a nick!user@host mask. CIDR is supported. Exempt
774 >         * entries can be stacked.
775 >         */
776 >        exempt = "FI";
777   };
778  
779   /*
780 < * gecos {}:  The X: replacement, used for banning users based on
692 < * their "realname".
780 > * gecos {}:  used for banning users based on their "realname".
781   */
782   gecos {
783          name = "*sex*";
# Line 701 | Line 789 | gecos {
789          reason = "Trojan drone";
790   };
791  
792 < gecos {
793 <        name = "*http*";
794 <        reason = "Spambot";
792 > /*
793 > * service {}: specifies a server which may act as a network service
794 > *
795 > * NOTE: it is very important that every server on the network
796 > *       has the same service {} block.
797 > */
798 > service {
799 >        name = "service.someserver";
800 >        name = "stats.someserver";
801   };
802  
803 < gecos {
804 <        name = "^\[J[0o]hn Do[3e]\]-[0-9]{2,5}$";
803 > /*
804 > * pseudo {}: adds pseudo/custom commands also known as service aliases
805 > */
806 > pseudo {
807 >        /* command: the actual command/alias */
808 >        command = "IDENTIFY";
809  
810 <        /*
811 <         * NOTE: You have to set type=regex; when using a regular expression
812 <         * based name entry
813 <         */
814 <        type = regex;
810 >        /* prepend: optional text that can be prepended before the user's message */
811 >        prepend = "IDENTIFY ";
812 >
813 >        /* name: the service name, used for error messages */
814 >        name = "NickServ";
815 >
816 >        /* target: the actual target where this message should be sent to */
817 >        target = "NickServ@service.someserver";
818 > };
819 >
820 > pseudo {
821 >        command = "CHANSERV";
822 >        name = "ChanServ";
823 >        target = "ChanServ@service.someserver";
824 > };
825 >
826 > pseudo {
827 >        command = "CS";
828 >        name = "ChanServ";
829 >        target = "ChanServ@service.someserver";
830 > };
831 >
832 > pseudo {
833 >        command = "NICKSERV";
834 >        name = "NickServ";
835 >        target = "NickServ@service.someserver";
836 > };
837 >
838 > pseudo {
839 >        command = "NS";
840 >        name = "NickServ";
841 >        target = "NickServ@service.someserver";
842 > };
843 >
844 > pseudo {
845 >        command = "MEMOSERV";
846 >        name = "MemoServ";
847 >        target = "MemoServ@service.someserver";
848 > };
849 >
850 > pseudo {
851 >        command = "MS";
852 >        name = "MemoServ";
853 >        target = "MemoServ@service.someserver";
854 > };
855 >
856 > pseudo {
857 >        command = "OPERSERV";
858 >        name = "OperServ";
859 >        target = "OperServ@service.someserver";
860 > };
861 >
862 > pseudo {
863 >        command = "OS";
864 >        name = "OperServ";
865 >        target = "OperServ@service.someserver";
866 > };
867 >
868 > pseudo {
869 >        command = "HOSTSERV";
870 >        name = "HostServ";
871 >        target = "HostServ@service.someserver";
872 > };
873 >
874 > pseudo {
875 >        command = "HS";
876 >        name = "HostServ";
877 >        target = "HostServ@service.someserver";
878 > };
879 >
880 > pseudo {
881 >        command = "BOTSERV";
882 >        name = "BotServ";
883 >        target = "BotServ@service.someserver";
884 > };
885 >
886 > pseudo {
887 >        command = "BS";
888 >        name = "BotServ";
889 >        target = "BotServ@service.someserver";
890   };
891  
892   /*
893 < * channel {}:  The channel block contains options pertaining to channels
893 > * channel {}:  the channel block contains options pertaining to channels
894   */
895   channel {
896          /*
897           * disable_fake_channels: this option, if set to 'yes', will
898 <         * disallow clients to create or join channels that have one
898 >         * disallow clients from creating or joining channels that have one
899           * of the following ASCII characters in their name:
900           *
901           *   2 | bold
902           *   3 | mirc color
903           *  15 | plain text
904           *  22 | reverse
905 +         *  29 | italic
906           *  31 | underline
907           * 160 | non-breaking space
908           */
909          disable_fake_channels = yes;
910  
911          /*
912 <         * restrict_channels: reverse channel RESVs logic, only reserved
913 <         * channels are allowed
740 <         */
741 <        restrict_channels = no;
742 <
743 <        /*
744 <         * disable_local_channels: prevent users from joining &channels.
745 <         */
746 <        disable_local_channels = no;
747 <
748 <        /*
749 <         * use_invex: Enable/disable channel mode +I, a n!u@h list of masks
750 <         * that can join a +i channel without an invite.
751 <         */
752 <        use_invex = yes;
753 <
754 <        /*
755 <         * use_except: Enable/disable channel mode +e, a n!u@h list of masks
756 <         * that can join a channel through a ban (+b).
757 <         */
758 <        use_except = yes;
759 <
760 <        /*
761 <         * use_knock: Allows users to request an invite to a channel that
762 <         * is locked somehow (+ikl).  If the channel is +p or you are banned
763 <         * the knock will not be sent.
912 >         * invite_client_count, invite_client_time: how many INVITE commands
913 >         * are permitted per client per invite_client_time.
914           */
915 <        use_knock = yes;
915 >        invite_client_count = 10;
916 >        invite_client_time = 5 minutes;
917  
918          /*
919 <         * knock_delay: The amount of time a user must wait between issuing
920 <         * the knock command.
919 >         * knock_client_count, knock_client_time: how many KNOCK commands
920 >         * are permitted per client per knock_client_time.
921           */
922 <        knock_delay = 5 minutes;
922 >        knock_client_count = 1;
923 >        knock_client_time = 5 minutes;
924  
925          /*
926 <         * knock_delay_channel: How often a knock to any specific channel
927 <         * is permitted, regardless of the user sending the knock.
926 >         * knock_delay_channel: how often a KNOCK to any specific channel
927 >         * is permitted, regardless of the user sending the KNOCK.
928           */
929          knock_delay_channel = 1 minute;
930  
931          /*
932 <         * max_chans_per_user: The maximum number of channels a user can
933 <         * join/be on.
932 >         * max_channels: the maximum number of channels a user can join/be on.
933 >         * This is a default value which can be overriden with class {} blocks.
934           */
935 <        max_chans_per_user = 25;
784 <
785 <        /* quiet_on_ban: stop banned people talking in channels. */
786 <        quiet_on_ban = yes;
935 >        max_channels = 25;
936  
937          /* max_bans: maximum number of +b/e/I modes in a channel */
938 <        max_bans = 25;
938 >        max_bans = 100;
939  
940          /*
941 <         * how many joins in how many seconds constitute a flood, use 0 to
941 >         * how many joins in how many seconds constitute a flood. Use 0 to
942           * disable. +b opers will be notified (changeable via /set)
943           */
944          join_flood_count = 16;
945          join_flood_time = 8 seconds;
946  
947          /*
948 <         * splitcode: The ircd will now check splitmode every few seconds.
948 >         * The ircd will now check splitmode (whether a server is split from
949 >         * the network) every few seconds; this functionality is known as
950 >         * splitcode and is influenced by the options below.
951           *
952           * Either split users or split servers can activate splitmode, but
953           * both conditions must be met for the ircd to deactivate splitmode.
954 <         *
954 >         *
955           * You may force splitmode to be permanent by /quote set splitmode on
956           */
957  
958          /*
959           * default_split_user_count: when the usercount is lower than this level,
960 <         * consider ourselves split.  This must be set for automatic splitmode.
960 >         * consider ourselves split. This must be set for automatic splitmode.
961           */
962          default_split_user_count = 0;
963  
964          /*
965           * default_split_server_count: when the servercount is lower than this,
966 <         * consider ourselves split.  This must be set for automatic splitmode.
966 >         * consider ourselves split. This must be set for automatic splitmode.
967           */
968          default_split_server_count = 0;
969  
970 <        /* no_create_on_split: disallow users creating channels on split. */
970 >        /* no_create_on_split: do not allow users to create channels on split. */
971          no_create_on_split = yes;
972  
973 <        /* no_join_on_split: disallow users joining channels at all on a split. */
973 >        /* no_join_on_split: do not allow users to join channels on a split. */
974          no_join_on_split = no;
975   };
976  
977   /*
978 < * serverhide {}:  The serverhide block contains the options regarding
979 < * serverhiding
978 > * serverhide {}:  the serverhide block contains the options regarding
979 > * to server hiding. For more information regarding server hiding,
980 > * please see doc/serverhide.txt
981   */
982   serverhide {
983          /*
984 +         * disable_remote_commands: disable users issuing commands
985 +         * on remote servers.
986 +         */
987 +        disable_remote_commands = no;
988 +
989 +        /*
990           * flatten_links: this option will show all servers in /links appear
991 <         * that they are linked to this current server
991 >         * as though they are linked to this current server.
992           */
993          flatten_links = no;
994  
# Line 842 | Line 1000 | serverhide {
1000  
1001          /*
1002           * hidden: hide this server from a /links output on servers that
1003 <         * support it.  This allows hub servers to be hidden etc.
1003 >         * support it. This allows hub servers to be hidden etc.
1004           */
1005          hidden = no;
1006  
1007          /*
850         * disable_hidden: prevent servers hiding themselves from a
851         * /links output.
852         */
853        disable_hidden = no;
854
855        /*
1008           * hide_servers: hide remote servernames everywhere and instead use
1009           * hidden_name and network_desc.
1010           */
1011          hide_servers = no;
1012  
1013          /*
1014 <         * Use this as the servername users see if hide_servers = yes.
1014 >         * hide_services: define this if you want to hide the location of
1015 >         * services servers that are specified in the service {} block.
1016 >         */
1017 >        hide_services = no;
1018 >
1019 >        /*
1020 >         * hidden_name: use this as the servername users see if hide_servers = yes.
1021           */
1022          hidden_name = "*.hidden.com";
1023  
1024          /*
1025 <         * hide_server_ips: If this is disabled, opers will be unable to see
1026 <         * servers ips and will be shown a masked ip, admins will be shown the
1027 <         * real ip.
1028 <         *
1029 <         * If this is enabled, nobody can see a servers ip. *This is a kludge*,
1030 <         * it has the side effect of hiding the ips everywhere, including
1031 <         * logfiles.
1025 >         * hide_server_ips: if this is disabled, opers will be unable to see
1026 >         * servers' IP addresses and will be shown a masked IP address; admins
1027 >         * will be shown the real IP address.
1028 >         *
1029 >         * If this is enabled, nobody can see a server's IP address.
1030 >         * *This is a kludge*: it has the side effect of hiding the IP addresses
1031 >         * everywhere, including logfiles.
1032           *
1033           * We recommend you leave this disabled, and just take care with who you
1034 <         * give admin=yes; to.
1034 >         * give administrator privileges to.
1035           */
1036          hide_server_ips = no;
1037   };
1038  
1039   /*
1040 < * general {}:  The general block contains many of the options that were once
1041 < * compiled in options in config.h.  The general block is read at start time.
1040 > * general {}:  the general block contains many of the options that were once
1041 > * compiled in options in config.h
1042   */
1043   general {
1044 <        /* services_name: servername of nick/channel services */
1045 <        services_name = "service.someserver";
1044 >        /*
1045 >         * cycle_on_host_change: sends a fake QUIT/JOIN combination
1046 >         * when services change the hostname of a specific client.
1047 >         */
1048 >        cycle_on_host_change = yes;
1049  
1050          /* max_watch: maximum WATCH entries a client can have. */
1051 <        max_watch = 60;
1051 >        max_watch = 30;
1052 >
1053 >        /* max_accept: maximum allowed /accept's for +g usermode. */
1054 >        max_accept = 30;
1055 >
1056 >        /* gline_enable: enable glines (network-wide temporary klines). */
1057 >        gline_enable = yes;
1058  
1059          /*
1060 <         * gline_min_cidr: the minimum required length of a CIDR bitmask
1061 <         * for IPv4 based glines
1060 >         * gline_duration: the amount of time a G-line will remain on your
1061 >         * server before expiring.
1062           */
1063 <        gline_min_cidr = 16;
1063 >        gline_duration = 1 day;
1064  
1065          /*
1066 <         * gline_min_cidr6: the minimum required length of a CIDR bitmask
1067 <         * for IPv6 based glines
1066 >         * gline_request_duration: how long a pending G-line can be around.
1067 >         * 10 minutes should be plenty.
1068           */
1069 <        gline_min_cidr6 = 48;
1069 >        gline_request_duration = 10 minutes;
1070  
1071          /*
1072 <         * Whether to automatically set mode +i on connecting users.
1072 >         * gline_min_cidr: the minimum required length of a CIDR bitmask
1073 >         * for IPv4 based G-lines.
1074           */
1075 <        invisible_on_connect = yes;
1075 >        gline_min_cidr = 16;
1076  
1077          /*
1078 <         * Show "actually using host <ip>" on /whois when possible.
1078 >         * gline_min_cidr6: the minimum required length of a CIDR bitmask
1079 >         * for IPv6 based G-lines.
1080           */
1081 <        use_whois_actually = yes;
1081 >        gline_min_cidr6 = 48;
1082  
1083          /*
1084 <         * Max time from the nickname change that still causes KILL
1085 <         * automatically to switch for the current nick of that user.
1084 >         * invisible_on_connect: whether to automatically set mode +i on
1085 >         * connecting users.
1086           */
1087 <        kill_chase_time_limit = 90 seconds;
1087 >        invisible_on_connect = yes;
1088  
1089          /*
1090 <         * If hide_spoof_ips is disabled, opers will be allowed to see the real
1091 <         * IP of spoofed users in /trace etc. If this is defined they will be
1092 <         * shown a masked IP.
1090 >         * kill_chase_time_limit: KILL chasing is a feature whereby a KILL
1091 >         * issued for a user who has recently changed nickname will be applied
1092 >         * automatically to the new nick. kill_chase_time_limit is the maximum
1093 >         * time following a nickname change that this chasing will apply.
1094           */
1095 <        hide_spoof_ips = yes;
1095 >        kill_chase_time_limit = 30 seconds;
1096  
1097          /*
1098 <         * Ignore bogus timestamps from other servers.  Yes, this will desync
1099 <         * the network, but it will allow chanops to resync with a valid non TS 0
1098 >         * ignore_bogus_ts: ignore bogus timestamps from other servers.
1099 >         * Yes, this will desync the network, but it will allow chanops
1100 >         * to resync with a valid non TS 0.
1101           *
1102           * This should be enabled network wide, or not at all.
1103           */
# Line 938 | Line 1109 | general {
1109           */
1110          disable_auth = no;
1111  
941        /* disable_remote_commands: disable users doing commands on remote servers */
942        disable_remote_commands = no;
943
1112          /*
1113           * tkline_expire_notices: enables or disables temporary kline/xline
1114           * expire notices.
# Line 949 | Line 1117 | general {
1117  
1118          /*
1119           * default_floodcount: the default value of floodcount that is configurable
1120 <         * via /quote set floodcount.  This is the amount of lines a user
1121 <         * may send to any other user/channel in one second.
1120 >         * via /quote set floodcount. This is the number of lines a user may send
1121 >         * to any other user/channel in one second.
1122           */
1123          default_floodcount = 10;
1124  
1125          /*
1126 <         * failed_oper_notice: send a notice to all opers on the server when
1126 >         * failed_oper_notice: send a notice to all opers on the server when
1127           * someone tries to OPER and uses the wrong password, host or ident.
1128           */
1129          failed_oper_notice = yes;
1130  
1131          /*
1132 <         * dots_in_ident: the amount of '.' characters permitted in an ident
1132 >         * dots_in_ident: the number of '.' characters permitted in an ident
1133           * reply before the user is rejected.
1134           */
1135          dots_in_ident = 2;
1136  
1137          /*
1138 <         * min_nonwildcard: the minimum non wildcard characters in k/d/g lines
1139 <         * placed via the server.  klines hand placed are exempt from limits.
1140 <         * wildcard chars: '.' ':' '*' '?' '@' '!' '#'
1138 >         * min_nonwildcard: the minimum number of non-wildcard characters in
1139 >         * k/d/g lines placed via the server. K-lines hand-placed are exempt from
1140 >         * this limit.
1141 >         * Wildcard characters: '.', ':', '*', '?', '@', '!'
1142           */
1143          min_nonwildcard = 4;
1144  
1145          /*
1146 <         * min_nonwildcard_simple: the minimum non wildcard characters in
1147 <         * gecos bans.  wildcard chars: '*' '?' '#'
1146 >         * min_nonwildcard_simple: the minimum number of non-wildcard characters
1147 >         * in gecos bans. Wildcard characters: '*', '?'
1148           */
1149          min_nonwildcard_simple = 3;
1150  
1151 <        /* max_accept: maximum allowed /accept's for +g usermode */
983 <        max_accept = 20;
984 <
985 <        /* anti_nick_flood: enable the nickflood control code */
1151 >        /* anti_nick_flood: enable the nickflood control code. */
1152          anti_nick_flood = yes;
1153  
1154 <        /* nick flood: the nick changes allowed in the specified period */
1154 >        /* nick flood: the number of nick changes allowed in the specified period. */
1155          max_nick_time = 20 seconds;
1156          max_nick_changes = 5;
1157  
1158          /*
1159 <         * anti_spam_exit_message_time: the minimum time a user must be connected
1160 <         * before custom quit messages are allowed.
995 <         */
996 <        anti_spam_exit_message_time = 5 minutes;
997 <
998 <        /*
999 <         * ts delta: the time delta allowed between server clocks before
1000 <         * a warning is given, or before the link is dropped.  all servers
1001 <         * should run ntpdate/rdate to keep clocks in sync
1159 >         * away_count, away_time: how many AWAY command are permitted per
1160 >         * client per away_time.
1161           */
1162 <        ts_warn_delta = 30 seconds;
1163 <        ts_max_delta = 5 minutes;
1162 >        away_count = 2;
1163 >        away_time = 10 seconds;
1164  
1165          /*
1166 <         * kline_with_reason: show the user the reason why they are k/d/glined
1167 <         * on exit.  May give away who set k/dline when set via tcm.
1009 <         */
1010 <        kline_with_reason = yes;
1011 <
1012 <        /*
1013 <         * kline_reason: show this message to users on channel
1014 <         * instead of the oper reason.
1166 >         * anti_spam_exit_message_time: the minimum time a user must be connected
1167 >         * before custom quit messages are allowed.
1168           */
1169 <        kline_reason = "Connection closed";
1169 >        anti_spam_exit_message_time = 5 minutes;
1170  
1171          /*
1172 <         * reject_hold_time: wait this amount of time before disconnecting
1173 <         * a rejected client. Use 0 to disable.
1172 >         * ts_warn_delta, ts_max_delta: the time delta allowed between server
1173 >         * clocks before a warning is given, or before the link is dropped.
1174 >         * All servers should run ntpdate/rdate to keep clocks in sync.
1175           */
1176 <        reject_hold_time = 0;
1176 >        ts_warn_delta = 3 seconds;
1177 >        ts_max_delta = 15 seconds;
1178  
1179          /*
1180 <         * warn_no_nline: warn opers about servers that try to connect but
1181 <         * we don't have a connect {} block for.  Twits with misconfigured
1182 <         * servers can get really annoying with this enabled.
1180 >         * warn_no_connect_block: warn opers about servers that try to connect
1181 >         * but for which we don't have a connect {} block. Twits with
1182 >         * misconfigured servers can become really annoying with this enabled.
1183           */
1184 <        warn_no_nline = yes;
1184 >        warn_no_connect_block = yes;
1185  
1186          /*
1187           * stats_e_disabled: set this to 'yes' to disable "STATS e" for both
1188 <         * operators and administrators.  Doing so is a good idea in case
1189 <         * there are any exempted (exempt{}) server IPs you don't want to
1188 >         * operators and administrators. Doing so is a good idea in case
1189 >         * there are any exempted (exempt {}) server IPs you don't want to
1190           * see leaked.
1191           */
1192          stats_e_disabled = no;
1193  
1194 <        /* stats_o_oper only: make stats o (opers) oper only */
1194 >        /* stats_o_oper_only: make stats o (opers) oper only. */
1195          stats_o_oper_only = yes;
1196  
1197 <        /* stats_P_oper_only: make stats P (ports) oper only */
1197 >        /* stats_P_oper_only: make stats P (ports) oper only. */
1198          stats_P_oper_only = yes;
1199  
1200 +        /* stats_u_oper_only: make stats u (uptime) oper only. */
1201 +        stats_u_oper_only = no;
1202 +
1203          /*
1204 <         * stats i oper only: make stats i (auth {}) oper only. set to:
1205 <         *     yes:    show users no auth blocks, made oper only.
1206 <         *     masked: show users first matching auth block
1207 <         *     no:     show users all auth blocks.
1204 >         * stats_i_oper_only: make stats i (auth {}) oper only. Set to:
1205 >         *     yes    - show users no auth {} blocks, made oper only
1206 >         *     masked - show users the first matching auth {} block
1207 >         *     no     - show users all auth {} blocks
1208           */
1209          stats_i_oper_only = yes;
1210  
1211          /*
1212 <         * stats_k_oper_only: make stats k/K (klines) oper only.  set to:
1213 <         *     yes:    show users no auth blocks, made oper only
1214 <         *     masked: show users first matching auth block
1215 <         *     no:     show users all auth blocks.
1212 >         * stats_k_oper_only: make stats k/K (klines) oper only. Set to:
1213 >         *     yes    - show users no auth {} blocks, made oper only
1214 >         *     masked - show users the first matching auth {} block
1215 >         *     no     - show users all auth {} blocks
1216           */
1217          stats_k_oper_only = yes;
1218  
# Line 1066 | Line 1224 | general {
1224  
1225          /*
1226           * opers_bypass_callerid: allows operators to bypass +g and message
1227 <         * anyone who has it set (useful if you use services).
1227 >         * anyone who has it set.
1228           */
1229          opers_bypass_callerid = no;
1230  
1231          /*
1232 <         * pace_wait_simple: time between use of less intensive commands
1233 <         * (ADMIN, HELP, (L)USERS, VERSION, remote WHOIS)
1232 >         * pace_wait_simple: minimum time required between use of less
1233 >         * intensive commands
1234 >         * (ADMIN, HELP, LUSERS, VERSION, remote WHOIS)
1235           */
1236          pace_wait_simple = 1 second;
1237  
1238          /*
1239 <         * pace_wait: time between more intensive commands
1240 <         * (INFO, LINKS, LIST, MAP, MOTD, STATS, WHO, wildcard WHOIS, WHOWAS)
1239 >         * pace_wait: minimum time required between use of more intensive commands
1240 >         * (INFO, LINKS, MAP, MOTD, STATS, WHO, WHOWAS)
1241           */
1242          pace_wait = 10 seconds;
1243  
1244          /*
1245 <         * short_motd: send clients a notice telling them to read the motd
1246 <         * instead of forcing a motd to clients who may simply ignore it.
1245 >         * short_motd: send clients a notice telling them to read the MOTD
1246 >         * instead of forcing an MOTD to clients who may simply ignore it.
1247           */
1248          short_motd = no;
1249  
1250          /*
1251 <         * ping_cookie: require clients to respond exactly to a ping command,
1251 >         * ping_cookie: require clients to respond exactly to a PING command,
1252           * can help block certain types of drones and FTP PASV mode spoofing.
1253           */
1254          ping_cookie = no;
# Line 1097 | Line 1256 | general {
1256          /* no_oper_flood: increase flood limits for opers. */
1257          no_oper_flood = yes;
1258  
1259 <        /*
1101 <         * true_no_oper_flood: completely eliminate flood limits for opers
1102 <         * and for clients with can_flood = yes in their auth {} blocks
1103 <         */
1104 <        true_no_oper_flood = yes;
1105 <
1106 <        /* oper_pass_resv: allow opers to over-ride RESVs on nicks/channels */
1259 >        /* oper_pass_resv: allow opers to over-ride RESVs on nicks/channels. */
1260          oper_pass_resv = yes;
1261  
1262 <        /* REMOVE ME.  The following line checks you've been reading. */
1262 >        /* REMOVE ME. The following line checks that you have been reading. */
1263          havent_read_conf = 1;
1264  
1265          /*
1266 <         * max_targets: the maximum amount of targets in a single
1267 <         * PRIVMSG/NOTICE.  Set to 999 NOT 0 for unlimited.
1266 >         * max_targets: the maximum number of targets in a single
1267 >         * PRIVMSG/NOTICE. Set to 999 NOT 0 for unlimited.
1268           */
1269          max_targets = 4;
1270  
1271          /*
1119         * client_flood: maximum amount of data in a clients queue before
1120         * they are dropped for flooding.
1121         */
1122        client_flood = 2560 bytes;
1123
1124        /*
1125         * message_locale: the default message locale
1126         * Use "standard" for the compiled in defaults.
1127         * To install the translated messages, go into messages/ in the
1128         * source directory and run `make install'.
1129         */
1130        message_locale = "standard";
1131
1132        /*
1272           * usermodes configurable: a list of usermodes for the options below
1273           *
1274           * +b - bots         - See bot and drone flooding notices
1275           * +c - cconn        - Client connection/quit notices
1137         * +C - cconn_full   - Client connection/quit notices full
1276           * +D - deaf         - Don't receive channel messages
1277           * +d - debug        - See debugging notices
1278 <         * +f - full         - See I: line full notices
1278 >         * +e - external     - See remote server connection and split notices
1279 >         * +F - farconnect   - Remote client connection/quit notices
1280 >         * +f - full         - See auth {} block full notices
1281           * +G - softcallerid - Server Side Ignore for users not on your channels
1282           * +g - callerid     - Server Side Ignore (for privmsgs etc)
1283           * +H - hidden       - Hides operator status to other users
1284 <         * +i - invisible    - Not shown in NAMES or WHO unless you share a
1145 <         *                     a channel
1284 >         * +i - invisible    - Not shown in NAMES or WHO unless you share a channel
1285           * +j - rej          - See rejected client notices
1286           * +k - skill        - See server generated KILL messages
1287           * +l - locops       - See LOCOPS messages
1288           * +n - nchange      - See client nick changes
1289 +         * +p - hidechans    - Hides channel list in WHOIS
1290 +         * +q - hideidle     - Hides idle and signon time in WHOIS
1291 +         * +R - nononreg     - Only receive private messages from registered clients
1292           * +s - servnotice   - See general server notices
1293           * +u - unauth       - See unauthorized client notices
1294           * +w - wallop       - See server generated WALLOPS
1153         * +x - external     - See remote server connection and split notices
1295           * +y - spy          - See LINKS, STATS, TRACE notices etc.
1155         * +z - operwall     - See oper generated WALLOPS
1296           */
1297  
1298 <        /* oper_only_umodes: usermodes only opers may set */
1299 <        oper_only_umodes = bots, cconn, cconn_full, debug, full, hidden, skill,
1300 <                           nchange, rej, spy, external, operwall,
1161 <                           locops, unauth;
1298 >        /* oper_only_umodes: usermodes only operators may set. */
1299 >        oper_only_umodes = bots, cconn, debug, external, farconnect, full, hidden, locops,
1300 >                        nchange, rej, skill, spy, unauth;
1301  
1302 <        /* oper_umodes: default usermodes opers get when they /oper */
1303 <        oper_umodes = bots, locops, servnotice, operwall, wallop;
1302 >        /* oper_umodes: default usermodes operators get when they /oper or /challenge. */
1303 >        oper_umodes = bots, locops, servnotice, wallop;
1304  
1305          /*
1306 <         * use_egd: if your system does not have *random devices yet you
1307 <         * want to use OpenSSL and encrypted links, enable this.  Beware -
1169 <         * EGD is *very* CPU intensive when gathering data for its pool
1306 >         * throttle_count: the maximum number of connections from the same
1307 >         * IP address allowed in throttle_time duration.
1308           */
1309 < #       use_egd = yes;
1309 >        throttle_count = 1;
1310  
1311          /*
1312 <         * egdpool_path: path to EGD pool. Not necessary for OpenSSL >= 0.9.7
1313 <         * which automatically finds the path.
1314 <         */
1315 < #       egdpool_path = "/var/run/egd-pool";
1178 <
1179 <        /*
1180 <         * throttle_time: the minimum amount of time between connections from
1181 <         * the same ip.  exempt {} blocks are excluded from this throttling.
1182 <         * Offers protection against flooders who reconnect quickly.  
1312 >         * throttle_time: the minimum amount of time required between
1313 >         * connections from the same IP address. exempt {} blocks are
1314 >         * excluded from this throttling.
1315 >         * Offers protection against flooders who reconnect quickly.
1316           * Set to 0 to disable.
1317           */
1318 <        throttle_time = 10;
1186 < };
1187 <
1188 < glines {
1189 <        /* enable: enable glines, network wide temp klines */
1190 <        enable = yes;
1191 <
1192 <        /*
1193 <         * duration: the amount of time a gline will remain on your
1194 <         * server before expiring
1195 <         */
1196 <        duration = 1 day;
1197 <
1198 <        /*
1199 <         * log: which types of rules you want to log when triggered
1200 <         * (choose reject or block)
1201 <         */
1202 <        log = reject, block;
1203 <
1204 <        /*
1205 <         * NOTE: gline ACLs can cause a desync of glines throughout the
1206 <         * network, meaning some servers may have a gline triggered, and
1207 <         * others may not. Also, you only need insert rules for glines
1208 <         * that you want to block and/or reject. If you want to accept and
1209 <         * propagate the gline, do NOT put a rule for it.
1210 <         */
1211 <
1212 <        /* user@host for rule to apply to */
1213 <        user = "god@I.still.hate.packets";
1214 <        /* server for rule to apply to */
1215 <        name = "hades.arpa";
1216 <
1217 <        /*
1218 <         * action: action to take when a matching gline is found. options are:
1219 <         *  reject - do not apply the gline locally
1220 <         *  block  - do not propagate the gline
1221 <         */
1222 <        action = reject, block;
1223 <
1224 <        user = "god@*";
1225 <        name = "*";
1226 <        action = block;
1318 >        throttle_time = 2 seconds;
1319   };
1320  
1321   modules {
1322          /*
1323           * path: other paths to search for modules specified below
1324 <         * and in /modload.
1324 >         * and in "/module load".
1325           */
1326 <        path = "/usr/local/ircd/lib/ircd-hybrid/modules";
1327 <        path = "/usr/local/ircd/lib/ircd-hybrid/modules/autoload";
1326 >        path = "lib/ircd-hybrid/modules";
1327 >        path = "lib/ircd-hybrid/modules/autoload";
1328  
1329 <        /* module: the name of a module to load on startup/rehash */
1330 <        #module = "some_module.la";
1329 >        /* module: the name of a module to load on startup/rehash. */
1330 > #       module = "some_module.la";
1331   };
1332  
1333   /*
# Line 1247 | Line 1339 | log {
1339  
1340          file {
1341                  type = oper;
1342 <                name = "/home/ircd/var/log/oper.log";
1342 >                name = "var/log/oper.log";
1343                  size = unlimited;
1344          };
1345  
1346          file {
1347                  type = user;
1348 <                name = "/home/ircd/var/log/user.log";
1348 >                name = "var/log/user.log";
1349                  size = 50 megabytes;
1350          };
1351  
1352          file {
1353                  type = kill;
1354 <                name = "/home/ircd/var/log/kill.log";
1354 >                name = "var/log/kill.log";
1355                  size = 50 megabytes;
1356          };
1357  
1358          file {
1359                  type = kline;
1360 <                name = "/home/ircd/var/log/kline.log";
1360 >                name = "var/log/kline.log";
1361                  size = 50 megabytes;
1362          };
1363  
1364          file {
1365                  type = dline;
1366 <                name = "/home/ircd/var/log/dline.log";
1366 >                name = "var/log/dline.log";
1367                  size = 50 megabytes;
1368          };
1369  
1370          file {
1371                  type = gline;
1372 <                name = "/home/ircd/var/log/gline.log";
1372 >                name = "var/log/gline.log";
1373 >                size = 50 megabytes;
1374 >        };
1375 >
1376 >        file {
1377 >                type = xline;
1378 >                name = "var/log/xline.log";
1379 >                size = 50 megabytes;
1380 >        };
1381 >
1382 >        file {
1383 >                type = resv;
1384 >                name = "var/log/resv.log";
1385                  size = 50 megabytes;
1386          };
1387  
1388          file {
1389                  type = debug;
1390 <                name = "/home/ircd/var/log/debug.log";
1390 >                name = "var/log/debug.log";
1391                  size = 50 megabytes;
1392 <        };
1392 >        };
1393   };

Diff Legend

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