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-8/doc/example.conf (file contents), Revision 1534 by michael, Sun Sep 23 13:17:14 2012 UTC vs.
ircd-hybrid/trunk/doc/reference.conf (file contents), Revision 2844 by michael, Thu Jan 16 20:20:47 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 > /* ircd-hybrid reference configuration file
2 > * Copyright (C) 2000-2014 Hybrid Development Team
3   *
4   * Written by ejb, wcampbel, db, leeh and others
5 * Other example configurations can be found in the source dir under
6 * doc/.
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,
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.
# Line 62 | Line 59 | serverinfo {
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 77 | 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           *
95         * Example command to store a 2048 bit RSA keypair in
96         * rsa.key, and the public key in rsa.pub:
97         *
107           *      openssl genrsa -out rsa.key 2048
108 <         *      openssl rsa -in rsa.key -pubout -out rsa.pub
100 <         *      chown <ircd-user>.<ircd.group> rsa.key rsa.pub
108 >         *      chown <ircd-user>.<ircd.group> rsa.key
109           *      chmod 0600 rsa.key
102         *      chmod 0644 rsa.pub
110           */
111 <        #rsa_private_key_file = "/usr/local/ircd/etc/rsa.key";
111 > #       rsa_private_key_file = "/usr/local/ircd/etc/rsa.key";
112  
113          /*
114           * ssl_certificate_file: the path to the file containing our
115 <         * ssl certificate for encrypted client connection.
115 >         * SSL certificate for encrypted client connection.
116           *
117           * This assumes your private RSA key is stored in rsa.key. You
118 <         * MUST have an RSA key in order to generate the certificate
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 121 | 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";
133 > #       ssl_certificate_file = "/usr/local/ircd/etc/cert.pem";
134  
135          /*
136           * ssl_dh_param_file:
137           *
138           * Path to the PEM encoded Diffie-Hellman parameter file.
139 <         * DH parameters are strictly required when using ciphers
140 <         * with EDH (ephemeral Diffie-Hellman) key exchange.
139 >         * DH parameters are required when using ciphers with EDH
140 >         * (ephemeral Diffie-Hellman) key exchange.
141           *
142           * A DH parameter file can be created by running:
143           *
# Line 138 | Line 147 | serverinfo {
147           * regarding specific OpenSSL dhparam command-line options
148           * can be found in the OpenSSL manual.
149           */
150 <        #ssl_dh_param_file = "/usr/local/ircd/etc/dhparam.pem";
150 > #       ssl_dh_param_file = "/usr/local/ircd/etc/dhparam.pem";
151  
152          /*
153           * ssl_cipher_list:
154           *
155 <         * List of ciphers that are supported by _this_ server. Can be used to
155 >         * List of ciphers to support on _this_ server. Can be used to
156           * enforce specific ciphers for incoming SSL/TLS connections.
157 <         * If a client (which also includes incoming server connections) isn't
158 <         * capable of any cipher listed below, the connection will simply be
159 <         * rejected.
160 <         * A list of supported ciphers can be obtained by running:
157 >         * If a client (which also includes incoming server connections) is not
158 >         * capable of using any of the ciphers listed here, the connection will
159 >         * simply be rejected.
160 >         *
161 >         * A list of supported ciphers by OpenSSL can be obtained by running:
162           *
163           *      openssl ciphers -ssl3 -tls1 -v
164           *
165           * Multiple ciphers are separated by colons. The order of preference is
166           * from left to right.
167           */
168 <        #ssl_cipher_list = "DHE-RSA-AES256-SHA:AES256-SHA";
168 > #       ssl_cipher_list = "DHE-RSA-AES256-SHA:AES256-SHA";
169  
170          /*
171           * ssl_server_method:
# Line 165 | Line 175 | serverinfo {
175           * outgoing (client method) SSL/TLS connections.
176           * This can be either sslv3 for SSLv3, and/or tlsv1 for TLSv1.
177           */
178 <        #ssl_server_method = tlsv1, sslv3;
179 <        #ssl_client_method = tlsv1;
178 > #       ssl_server_method = tlsv1, sslv3;
179 > #       ssl_client_method = tlsv1;
180   };
181  
182   /*
# Line 182 | Line 192 | admin {
192   * class {}:  contains information about classes for users
193   */
194   class {
195 <        /* name: the name of the class */
195 >        /* name: the name of the class. */
196          name = "users";
197  
198          /*
# Line 193 | Line 203 | class {
203  
204          /*
205           * number_per_ip: how many local users are allowed to connect
206 <         * from one IP  (optional)
206 >         * from a single IP address  (optional)
207           */
208          number_per_ip = 2;
209  
210          /*
211           * max_local: how many local users are allowed to connect
212 <         * from one ident@host  (optional)
212 >         * from a single ident@host  (optional)
213           */
214          max_local = 2;
215  
# Line 215 | Line 225 | class {
225  
226          /*
227           * the following lines are optional and allow you to define
228 <         * how many users can connect from one /NN subnet
228 >         * how many users can connect from one /NN subnet.
229           */
230          cidr_bitlen_ipv4 = 24;
231          cidr_bitlen_ipv6 = 120;
232          number_per_cidr = 16;
233  
234          /*
235 <         * sendq: the amount of data allowed in a clients queue before
235 >         * sendq: the amount of data allowed in a client's send queue before
236           * they are dropped.
237           */
238          sendq = 100 kbytes;
239  
240          /*
241 <         * recvq: maximum amount of data in a clients queue before they
242 <         * are dropped for flooding. Defaults to 2560 if the chosen
241 >         * recvq: the amount of data allowed in a client's receive queue before
242 >         * they are dropped for flooding. Defaults to 2560 if the chosen
243           * value isn't within the range of 512 to 8000.
244           */
245          recvq = 2560 bytes;
# Line 241 | Line 251 | class {
251          number_per_ip = 10;
252          max_number = 100;
253          sendq = 100 kbytes;
254 +
255 +        /*
256 +         * min_idle: minimum idle time that is shown in /whois.
257 +         */
258 +        min_idle = 3 hours;
259 +
260 +        /*
261 +         * max_idle: maximum idle time that is shown in /whois.
262 +         */
263 +        max_idle = 8 hours;
264 +
265 +        /*
266 +         * flags:
267 +         *
268 +         * random_idle          - a fake idle time is set randomly between
269 +         *                        min_idle and max_idle
270 +         * hide_idle_from_opers - the fake idle time will also be shown to operators
271 +         */
272 +        flags = random_idle, hide_idle_from_opers;
273   };
274  
275   class {
# Line 248 | Line 277 | class {
277          ping_time = 90 seconds;
278  
279          /*
280 <         * ping_warning: how fast a server must reply to a PING before
252 <         * a warning to opers is generated.
253 <         */
254 <        ping_warning = 15 seconds;
255 <
256 <        /*
257 <         * connectfreq: only used in server classes.  Specifies the delay
280 >         * connectfreq: only used in server classes. Specifies the delay
281           * between autoconnecting to servers.
282           */
283          connectfreq = 5 minutes;
284  
285 <        /* max number: the amount of servers to autoconnect to */
285 >        /* max number: the number of servers to autoconnect to. */
286          max_number = 1;
287  
288 <        /* sendq: servers need a higher sendq as they send more data */
288 >        /* sendq: servers need a higher sendq as they send more data. */
289          sendq = 2 megabytes;
290   };
291  
292   /*
293 + * motd {}: Allows the display of a different MOTD to a client
294 + * depending on its origin. Applies to local users only.
295 + */
296 + motd {
297 +        /*
298 +         * mask: multiple mask entries are permitted. Mask can either be
299 +         * a class name or a hostname.
300 +         */
301 +        mask = "*.at";
302 +        mask = "*.de";
303 +        mask = "*.ch";
304 +
305 +        /*
306 +         * file: path to the actual motd file.
307 +         */
308 +        file = "/usr/local/ircd/etc/german.motd";
309 + };
310 +
311 + /*
312   * listen {}:  contains information about the ports ircd listens on
313   */
314   listen {
315          /*
316 <         * port: the specific port to listen on.  If no host is specified
317 <         * before, it will listen on all available IPs.
316 >         * port: the port to listen on. If no host is specified
317 >         * earlier in the listen {} block, it will listen on all available IPs.
318           *
319 <         * Ports are separated via a comma, a range may be specified using ".."
319 >         * Ports are separated by commas; a range may be specified using ".."
320           */
321 <        
322 <        /* port: listen on all available IPs, ports 6665 to 6669 */
321 >
322 >        /* port: listen on all available IP addresses, ports 6665 to 6669 */
323          port = 6665 .. 6669;
324  
325          /*
326 <         * Listen on 192.168.0.1/6697 with ssl enabled and hidden from STATS P
326 >         * Listen on 192.168.0.1/6697 with SSL enabled and hidden from STATS P
327           * unless you are an administrator.
328           *
329 <         * NOTE: The "flags" directive has to come before "port".  Always!
329 >         * NOTE: The "flags" directive always has to come before "port".
330           *
331           * Currently available flags are:
332           *
333 <         *  ssl    - Port is for SSL client connections only
333 >         *  ssl    - Port may only accept TLS/SSL connections
334           *  server - Only server connections are permitted
335           *  hidden - Port is hidden from /stats P, unless you're an admin
336           */
# Line 297 | Line 339 | listen {
339          port = 6697;
340  
341          /*
342 <         * host: set a specific IP/host the ports after the line will listen
343 <         * on.  This may be ipv4 or ipv6.
342 >         * host: set a specific IP address/host to listen on using the
343 >         * subsequent port definitions. This may be IPv4 or IPv6.
344           */
345          host = "1.2.3.4";
346          port = 7000, 7001;
# Line 312 | Line 354 | listen {
354   */
355   auth {
356          /*
357 <         * user: the user@host allowed to connect.  Multiple IPv4/IPv6 user
358 <         * lines are permitted per auth block.
357 >         * user: the user@host allowed to connect. Multiple user
358 >         * lines are permitted within each auth block.
359           */
360          user = "*@172.16.0.0/12";
361          user = "*test@123D:B567:*";
# Line 328 | Line 370 | auth {
370          encrypted = yes;
371  
372          /*
373 <         * spoof: fake the users host to this.  This is free-form,
374 <         * just do everyone a favor and don't abuse it. ('=' prefix on /stats I)
373 >         * spoof: fake the user's host to this. This is free-form, just do
374 >         * everyone a favor and don't abuse it. ('=' prefix on /stats I)
375           */
376          spoof = "I.still.hate.packets";
377  
# Line 348 | Line 390 | auth {
390           * resv_exempt   - exempt this user from resvs ('$' prefix on /stats I)
391           * no_tilde      - remove ~ from a user with no ident ('-' prefix on /stats I)
392           * can_flood     - allow this user to exceed flood limits ('|' prefix on /stats I)
393 +         * webirc        - enables WEBIRC authentication for web-based clients such as Mibbit
394 +         *                 ('<' prefix on /stats I)
395           */
396          flags = need_password, spoof_notice, exceed_limit, kline_exempt,
397                  gline_exempt, resv_exempt, no_tilde, can_flood;
# Line 355 | Line 399 | auth {
399  
400   auth {
401          /*
402 <         * redirect: the server and port to redirect a user to.  A user does
403 <         * not have to obey the redirection, the ircd just suggests an alternative
402 >         * redirect: the server and port to redirect a user to. A user does not
403 >         * have to obey the redirection; the ircd just suggests an alternative
404           * server for them.
405           */
406          redirserv = "this.is.not.a.real.server";
407          redirport = 6667;
408 <        
408 >
409          user = "*.server";
410  
411          /* class: a class is required even though it is not used */
# Line 376 | Line 420 | auth {
420  
421   /*
422   * operator {}:  defines ircd operators
379 *
380 * ircd-hybrid no longer supports local operators, privileges are
381 * controlled via flags.
423   */
424   operator {
425          /* name: the name of the oper */
426 <        name = "god";
426 >        name = "sheep";
427  
428          /*
429           * user: the user@host required for this operator. Multiple
430           * user="" lines are supported.
431           */
432 <        user = "*god@192.168.0.0/16";
432 >        user = "*sheep@192.168.0.0/16";
433          user = "*@127.0.0.0/8";
434  
435          /*
436 <         * password: the password required to oper.  By default this will
436 >         * password: the password required to oper. By default this will
437           * need to be encrypted by using the provided mkpasswd tool.
438           * Several password hash algorithms are available depending
439           * on your system's crypt() implementation. For example, a modern
440 <         * glibc already has support for SHA-256/512, and MD5 encryption
440 >         * glibc already has support for the SHA-256/512 and MD5 encryption
441           * algorithms.
442           */
443          password = "$5$x5zof8qe.Yc7/bPp$5zIg1Le2Lsgd4CvOjaD20pr5PmcfD7ha/9b2.TaUyG4";
# Line 409 | Line 450 | operator {
450  
451          /*
452           * rsa_public_key_file: the public key for this oper when using Challenge.
453 <         * A password should not be defined when this is used, see
453 >         * A password should not be defined when this is used; see
454           * doc/challenge.txt for more information.
455           */
456   #       rsa_public_key_file = "/usr/local/ircd/etc/oper.pub";
457  
458 +        /*
459 +         * ssl_certificate_fingerprint: enhances security by additionally checking
460 +         * the oper's client certificate fingerprint against the specified
461 +         * fingerprint below.
462 +         *
463 +         * Hint: your users can use the following command to obtain a SHA-256 hash
464 +         * of their ssl certificate:
465 +         *
466 +         *      openssl x509 -sha256 -noout -fingerprint -in cert.pem | sed -e 's/^.*=//;s/://g'
467 +         */
468 + #       ssl_certificate_fingerprint = "4C62287BA6776A89CD4F8FF10A62FFB35E79319F51AF6C62C674984974FCCB1D";
469 +
470 +        /*
471 +         * ssl_connection_required: client must be connected over SSL/TLS
472 +         * in order to be able to use this oper{} block.
473 +         * Default is 'no' if nothing else is specified.
474 +         */
475 +        ssl_connection_required = no;
476 +
477          /* class: the class the oper joins when they successfully /oper */
478          class = "opers";
479  
480          /*
481 <         * umodes: default usermodes opers get when they /oper.  If defined,
481 >         * umodes: the default usermodes opers get when they /oper. If defined,
482           * it will override oper_umodes settings in general {}.
483           * Available usermodes:
484           *
485           * +b - bots         - See bot and drone flooding notices
486           * +c - cconn        - Client connection/quit notices
427         * +C - cconn_full   - Client connection/quit notices full
487           * +D - deaf         - Don't receive channel messages
488           * +d - debug        - See debugging notices
489 +         * +e - external     - See remote server connection and split notices
490 +         * +F - farconnect   - Remote client connection/quit notices
491           * +f - full         - See auth{} block full notices
492           * +G - softcallerid - Server Side Ignore for users not on your channels
493           * +g - callerid     - Server Side Ignore (for privmsgs etc)
494           * +H - hidden       - Hides operator status to other users
495 <         * +i - invisible    - Not shown in NAMES or WHO unless you share a
435 <         *                     a channel
495 >         * +i - invisible    - Not shown in NAMES or WHO unless you share a channel
496           * +j - rej          - See rejected client notices
497           * +k - skill        - See server generated KILL messages
498           * +l - locops       - See LOCOPS messages
499           * +n - nchange      - See client nick changes
500 +         * +R - nononreg     - Only receive private messages from registered clients
501           * +s - servnotice   - See general server notices
502           * +u - unauth       - See unauthorized client notices
503           * +w - wallop       - See server generated WALLOPS
443         * +x - external     - See remote server connection and split notices
504           * +y - spy          - See LINKS, STATS, TRACE notices etc.
505           * +z - operwall     - See oper generated WALLOPS
506           */
507 < #       umodes = locops, servnotice, operwall, wallop;
507 >        umodes = locops, servnotice, operwall, wallop;
508  
509          /*
510 <         * privileges: controls the activities and commands an oper is
510 >         * privileges: controls the activities and commands an oper is
511           * allowed to do on the server. All options default to no.
512           * Available options:
513           *
514 <         * module       - allows MODULE
515 <         * global_kill  - allows remote users to be /KILL'd
516 <         * remote       - allows remote SQUIT and CONNECT
517 <         * remoteban    - allows remote KLINE/UNKLINE
518 <         * dline        - allows DLINE
519 <         * undline      - allows UNDLINE
520 <         * kline        - allows KILL and KLINE
521 <         * unkline      - allows UNKLINE
522 <         * gline        - allows GLINE
523 <         * xline        - allows XLINE
524 <         * globops      - allows GLOBOPS
525 <         * operwall     - allows OPERWALL
526 <         * nick_changes - allows oper to see nickchanges via usermode +n
527 <         * rehash       - allows oper to REHASH config
528 <         * die          - allows DIE
529 <         * restart      - allows RESTART
530 <         * set          - allows SET
531 <         * admin        - gives admin privileges. admins for example,
532 <         *                may see the real IP addresses of servers.
514 >         * module         - allows MODULE
515 >         * connect        - allows local CONNECT              | ('P' flag)
516 >         * connect:remote - allows remote CONNECT             | ('Q' flag)
517 >         * squit          - allows local SQUIT                | ('R' flag)
518 >         * squit:remote   - allows remote SQUIT               | ('S' flag)
519 >         * kill           - allows to KILL local clients      | ('N' flag)
520 >         * kill:remote    - allows remote users to be /KILL'd | ('O' flag)
521 >         * remoteban      - allows remote KLINE/UNKLINE       | ('B' flag)
522 >         * dline          - allows DLINE                      |
523 >         * undline        - allows UNDLINE                    |
524 >         * kline          - allows KLINE                      | ('K' flag)
525 >         * unkline        - allows UNKLINE                    | ('U' flag)
526 >         * gline          - allows GLINE                      | ('G' flag)
527 >         * xline          - allows XLINE                      | ('X' flag)
528 >         * locops         - allows LOCOPS                     |
529 >         * globops        - allows GLOBOPS                    |
530 >         * wallops        - allows WALLOPS                    |
531 >         * operwall       - allows OPERWALL                   | ('L' flag)
532 >         * rehash         - allows oper to REHASH config      | ('H' flag)
533 >         * die            - allows DIE                        | ('D' flag)
534 >         * restart        - allows RESTART                    |
535 >         * set            - allows SET                        |
536 >         * admin          - gives administrator privileges    | ('A' flag)
537           */
538 <        flags = global_kill, remote, kline, unkline, xline, globops, restart,
539 <                die, rehash, nick_changes, admin, operwall, module;
538 >        flags = kill, kill:remote, connect, connect:remote, kline, unkline,
539 >                xline, globops, restart, die, rehash, admin, operwall, module;
540   };
541  
542 + /*
543 + * service {}: specifies a server which may act as a network service
544 + *
545 + * NOTE: it is very important that every server on the network
546 + *       has the same service{} block.
547 + */
548   service {
549          name = "service.someserver";
550          name = "stats.someserver";
551   };
552  
553   /*
554 < * connect {}:  controls servers we connect to
554 > * connect {}: define a server to connect to
555   */
556   connect {
557          /* name: the name of the server */
558          name = "irc.uplink.com";
559  
560          /*
561 <         * host: the host or IP to connect to.  If a hostname is used it
562 <         * must match the reverse dns of the server.
561 >         * host: the host or IP address to connect to. If a hostname is used it
562 >         * must match the reverse DNS of the server.
563           */
564          host = "192.168.0.1";
565  
566          /*
567 <         * vhost: the IP to bind to when we connect outward to servers.
567 >         * vhost: the IP address to bind to when making outgoing connections to
568 >         * servers.
569           * serverinfo::vhost and serverinfo::vhost6 will be overridden
570           * by this directive.
571           */
572          vhost = "192.168.0.2";
573  
574          /*
575 <         * passwords: the passwords we send (OLD C:) and accept (OLD N:).
576 <         * The remote server will have these passwords reversed.
575 >         * passwords: the passwords to send (OLD C:) and accept (OLD N:).
576 >         * The remote server will have these passwords swapped.
577           */
578          send_password = "password";
579          accept_password = "anotherpassword";
# Line 517 | Line 588 | connect {
588          port = 6666;
589  
590          /*
591 <         * hub_mask: the mask of servers that this server may hub.  Multiple
592 <         * entries are permitted
591 >         * hub_mask: the mask of servers that this server may hub. Multiple
592 >         * entries are permitted.
593           */
594          hub_mask = "*";
595  
596          /*
597 <         * leaf_mask: the mask of servers this server may not hub.  Multiple
598 <         * entries are permitted.  Useful for forbidding EU -> US -> EU routes.
597 >         * leaf_mask: the mask of servers this server may not hub. Multiple
598 >         * entries are permitted. Useful for forbidding EU -> US -> EU routes.
599           */
600   #       leaf_mask = "*.uk";
601  
# Line 535 | Line 606 | connect {
606           * ssl_cipher_list:
607           *
608           * List of ciphers that the server we are connecting to must support.
609 <         * If the server isn't capable of any cipher listed below, the
610 <         * connection will simply be rejected.
609 >         * If the server is not capable of using any of the ciphers listed below,
610 >         * 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 = "DHE-RSA-AES256-SHA:AES256-SHA";
617 > #       ssl_cipher_list = "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,
# Line 574 | 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           *
# Line 587 | Line 665 | cluster {
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 605 | 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 649 | Line 728 | kill {
728          reason = "Obviously hacked account";
729   };
730  
652 kill {
653        user = "^O[[:alpha:]]?[[:digit:]]+(x\.o|\.xo)$@^[[:alnum:]]{4}\.evilnet.tld$";
654
655        /*
656         * NOTE: You have to set type=regex; when using a regular expression
657         * based user entry
658         */
659        type = regex;
660 };
661
731   /*
732 < * deny {}:  IPs that are not allowed to connect (before DNS/ident lookup)
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 config
735   */
736   deny {
# Line 669 | 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 678 | 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 = "ChanServ"; reason = "Reserved for services"; };
753 + resv { mask = "NickServ"; reason = "Reserved for services"; };
754 + resv { mask = "OperServ"; reason = "Reserved for services"; };
755 + resv { mask = "MemoServ"; reason = "Reserved for services"; };
756 + resv { mask = "BotServ"; reason = "Reserved for services"; };
757 + resv { mask = "HelpServ"; reason = "Reserved for services"; };
758 + resv { mask = "HostServ"; reason = "Reserved for services"; };
759 + resv { mask = "StatServ"; reason = "Reserved for services"; };
760 + resv { mask = "#*services*"; reason = "Reserved for services"; };
761 +
762   resv {
763 <        /* reason: the reason for the proceeding resv's */
764 <        reason = "Reserved for services";
763 >        /*
764 >         * mask: masks starting with a '#' are automatically considered
765 >         * as channel name masks.
766 >         */
767 >        mask = "#helsinki";
768 >        reason = "Channel is reserved for finnish inhabitants";
769  
770 <        /* resv: the nicks and channels users may not join/use */
771 <        nick = "Global";
772 <        nick = "DevNull";
773 <        nick = "BotServ";
774 <        nick = "Services";
775 <        nick = "StatServ";
691 <        nick = "HelpServ";
692 <        nick = "HostServ";
693 <        nick = "NickServ";
694 <        nick = "ChanServ";
695 <        nick = "MemoServ";
696 <        nick = "OperServ";
697 <        channel = "#services";
698 <
699 <        /* resv: wildcard masks are also supported in nicks only */
700 <        reason = "Clone bots";
701 <        nick = "clone*";
770 >        /*
771 >         * exempt: can be either a ISO 3166 alpha-2 two letter country
772 >         * code, or a nick!user@host mask. CIDR is supported. Exempt
773 >         * entries can be stacked.
774 >         */
775 >        exempt = "FI";
776   };
777  
778   /*
779 < * gecos {}:  The X: replacement, used for banning users based on
706 < * their "realname".
779 > * gecos {}:  Used for banning users based on their "realname".
780   */
781   gecos {
782          name = "*sex*";
# Line 715 | Line 788 | gecos {
788          reason = "Trojan drone";
789   };
790  
718 gecos {
719        name = "*http*";
720        reason = "Spambot";
721 };
722
723 gecos {
724        name = "^\[J[0o]hn Do[3e]\]-[0-9]{2,5}$";
725
726        /*
727         * NOTE: You have to set type=regex; when using a regular expression
728         * based name entry
729         */
730        type = regex;
731 };
732
791   /*
792   * channel {}:  The channel block contains options pertaining to channels
793   */
794   channel {
795          /*
796           * disable_fake_channels: this option, if set to 'yes', will
797 <         * disallow clients to create or join channels that have one
797 >         * disallow clients from creating or joining channels that have one
798           * of the following ASCII characters in their name:
799           *
800           *   2 | bold
# Line 750 | Line 808 | channel {
808          disable_fake_channels = yes;
809  
810          /*
753         * restrict_channels: reverse channel RESVs logic, only reserved
754         * channels are allowed
755         */
756        restrict_channels = no;
757
758        /*
811           * knock_delay: The amount of time a user must wait between issuing
812           * the knock command.
813           */
# Line 779 | Line 831 | channel {
831           */
832          max_chans_per_oper = 50;
833  
782        /* quiet_on_ban: stop banned people talking in channels. */
783        quiet_on_ban = yes;
784
834          /* max_bans: maximum number of +b/e/I modes in a channel */
835          max_bans = 100;
836  
837          /*
838 <         * how many joins in how many seconds constitute a flood, use 0 to
838 >         * how many joins in how many seconds constitute a flood. Use 0 to
839           * disable. +b opers will be notified (changeable via /set)
840           */
841          join_flood_count = 16;
842          join_flood_time = 8 seconds;
843  
844          /*
845 <         * splitcode: The ircd will now check splitmode every few seconds.
845 >         * The ircd will now check splitmode (whether a server is split from
846 >         * the network) every few seconds; this functionality is known as
847 >         * splitcode and is influenced by the options below.
848           *
849           * Either split users or split servers can activate splitmode, but
850           * both conditions must be met for the ircd to deactivate splitmode.
851 <         *
851 >         *
852           * You may force splitmode to be permanent by /quote set splitmode on
853           */
854  
855          /*
856           * default_split_user_count: when the usercount is lower than this level,
857 <         * consider ourselves split.  This must be set for automatic splitmode.
857 >         * consider ourselves split. This must be set for automatic splitmode.
858           */
859          default_split_user_count = 0;
860  
861          /*
862           * default_split_server_count: when the servercount is lower than this,
863 <         * consider ourselves split.  This must be set for automatic splitmode.
863 >         * consider ourselves split. This must be set for automatic splitmode.
864           */
865          default_split_server_count = 0;
866  
867 <        /* no_create_on_split: disallow users creating channels on split. */
867 >        /* no_create_on_split: do not allow users to create channels on split. */
868          no_create_on_split = yes;
869  
870 <        /* no_join_on_split: disallow users joining channels at all on a split. */
870 >        /* no_join_on_split: do not allow users to join channels on a split. */
871          no_join_on_split = no;
872   };
873  
874   /*
875   * serverhide {}:  The serverhide block contains the options regarding
876 < * serverhiding
876 > * to server hiding
877   */
878   serverhide {
879          /*
880 +         * disable_remote_commands: disable users issuing commands
881 +         * on remote servers.
882 +         */
883 +        disable_remote_commands = no;
884 +
885 +        /*
886           * flatten_links: this option will show all servers in /links appear
887 <         * that they are linked to this current server
887 >         * as though they are linked to this current server.
888           */
889          flatten_links = no;
890  
# Line 839 | Line 896 | serverhide {
896  
897          /*
898           * hidden: hide this server from a /links output on servers that
899 <         * support it.  This allows hub servers to be hidden etc.
899 >         * support it. This allows hub servers to be hidden etc.
900           */
901          hidden = no;
902  
# Line 850 | Line 907 | serverhide {
907          hide_servers = no;
908  
909          /*
910 +         * hide_services: define this if you want to hide the location of
911 +         * services servers that are specified in the service{} block.
912 +         */
913 +        hide_services = no;
914 +
915 +        /*
916           * Use this as the servername users see if hide_servers = yes.
917           */
918          hidden_name = "*.hidden.com";
919  
920          /*
921           * hide_server_ips: If this is disabled, opers will be unable to see
922 <         * servers ips and will be shown a masked ip, admins will be shown the
923 <         * real ip.
922 >         * servers' IP addresses and will be shown a masked IP address; admins
923 >         * will be shown the real IP address.
924           *
925 <         * If this is enabled, nobody can see a servers ip. *This is a kludge*,
926 <         * it has the side effect of hiding the ips everywhere, including
927 <         * logfiles.
925 >         * If this is enabled, nobody can see a server's IP address.
926 >         * *This is a kludge*: it has the side effect of hiding the IP addresses
927 >         * everywhere, including logfiles.
928           *
929           * We recommend you leave this disabled, and just take care with who you
930 <         * give admin=yes; to.
930 >         * give administrator privileges to.
931           */
932          hide_server_ips = no;
933   };
934  
935   /*
936   * general {}:  The general block contains many of the options that were once
937 < * compiled in options in config.h.  The general block is read at start time.
937 > * compiled in options in config.h
938   */
939   general {
940 +        /*
941 +         * cycle_on_host_change: sends a fake QUIT/JOIN combination
942 +         * when services change the hostname of a specific client.
943 +         */
944 +        cycle_on_host_change = yes;
945 +
946          /* services_name: servername of nick/channel services */
947          services_name = "service.someserver";
948  
949          /* max_watch: maximum WATCH entries a client can have. */
950          max_watch = 60;
951  
952 <        /* gline_enable: enable glines, network wide temp klines */
952 >        /* gline_enable: enable glines (network-wide temporary klines). */
953          gline_enable = yes;
954  
955          /*
956           * gline_duration: the amount of time a gline will remain on your
957 <         * server before expiring
957 >         * server before expiring.
958           */
959          gline_duration = 1 day;
960  
961          /*
962 <         * gline_request_duration:  how long a pending G-line can be around.
963 <         * 10 minutes should be plenty
962 >         * gline_request_duration: how long a pending G-line can be around.
963 >         * 10 minutes should be plenty.
964           */
965          gline_request_duration = 10 minutes;
966  
967          /*
968           * gline_min_cidr: the minimum required length of a CIDR bitmask
969 <         * for IPv4 based glines
969 >         * for IPv4 based glines.
970           */
971          gline_min_cidr = 16;
972  
973          /*
974           * gline_min_cidr6: the minimum required length of a CIDR bitmask
975 <         * for IPv6 based glines
975 >         * for IPv6 based glines.
976           */
977          gline_min_cidr6 = 48;
978  
# Line 913 | Line 982 | general {
982          invisible_on_connect = yes;
983  
984          /*
985 <         * Show "actually using host <ip>" on /whois when possible.
986 <         */
987 <        use_whois_actually = yes;
988 <
920 <        /*
921 <         * Max time from the nickname change that still causes KILL
922 <         * automatically to switch for the current nick of that user.
985 >         * kill_chase_time_limit: KILL chasing is a feature whereby a KILL
986 >         * issued for a user who has recently changed nickname will be applied
987 >         * automatically to the new nick. kill_chase_time_limit is the maximum
988 >         * time following a nickname change that this chasing will apply.
989           */
990          kill_chase_time_limit = 90 seconds;
991  
992          /*
993 <         * If hide_spoof_ips is disabled, opers will be allowed to see the real
994 <         * IP of spoofed users in /trace etc. If this is defined they will be
995 <         * shown a masked IP.
993 >         * hide_spoof_ips: if disabled, opers will be allowed to see the real
994 >         * IP address of spoofed users in /trace etc. If this is defined they
995 >         * will be shown a masked IP.
996           */
997          hide_spoof_ips = yes;
998  
999          /*
1000 <         * Ignore bogus timestamps from other servers.  Yes, this will desync
1001 <         * the network, but it will allow chanops to resync with a valid non TS 0
1000 >         * Ignore bogus timestamps from other servers. Yes, this will desync the
1001 >         * network, but it will allow chanops to resync with a valid non TS 0
1002           *
1003           * This should be enabled network wide, or not at all.
1004           */
# Line 944 | Line 1010 | general {
1010           */
1011          disable_auth = no;
1012  
947        /* disable_remote_commands: disable users doing commands on remote servers */
948        disable_remote_commands = no;
949
1013          /*
1014           * tkline_expire_notices: enables or disables temporary kline/xline
1015           * expire notices.
# Line 955 | Line 1018 | general {
1018  
1019          /*
1020           * default_floodcount: the default value of floodcount that is configurable
1021 <         * via /quote set floodcount.  This is the amount of lines a user
1021 >         * via /quote set floodcount. This is the number of lines a user
1022           * may send to any other user/channel in one second.
1023           */
1024          default_floodcount = 10;
1025  
1026          /*
1027 <         * failed_oper_notice: send a notice to all opers on the server when
1027 >         * failed_oper_notice: send a notice to all opers on the server when
1028           * someone tries to OPER and uses the wrong password, host or ident.
1029           */
1030          failed_oper_notice = yes;
1031  
1032          /*
1033 <         * dots_in_ident: the amount of '.' characters permitted in an ident
1033 >         * dots_in_ident: the number of '.' characters permitted in an ident
1034           * reply before the user is rejected.
1035           */
1036          dots_in_ident = 2;
1037  
1038          /*
1039 <         * min_nonwildcard: the minimum non wildcard characters in k/d/g lines
1040 <         * placed via the server.  klines hand placed are exempt from limits.
1041 <         * wildcard chars: '.' ':' '*' '?' '@' '!' '#'
1039 >         * min_nonwildcard: the minimum number of non-wildcard characters in
1040 >         * k/d/g lines placed via the server. K-lines hand-placed are exempt from
1041 >         * this limit.
1042 >         * Wildcard chars: '.', ':', '*', '?', '@', '!'
1043           */
1044          min_nonwildcard = 4;
1045  
1046          /*
1047 <         * min_nonwildcard_simple: the minimum non wildcard characters in
1048 <         * gecos bans.  wildcard chars: '*' '?' '#'
1047 >         * min_nonwildcard_simple: the minimum number of non-wildcard characters
1048 >         * in gecos bans. Wildcard chars: '*', '?'
1049           */
1050          min_nonwildcard_simple = 3;
1051  
1052 <        /* max_accept: maximum allowed /accept's for +g usermode */
1052 >        /* max_accept: maximum allowed /accept's for +g usermode. */
1053          max_accept = 20;
1054  
1055 <        /* anti_nick_flood: enable the nickflood control code */
1055 >        /* anti_nick_flood: enable the nickflood control code. */
1056          anti_nick_flood = yes;
1057  
1058 <        /* nick flood: the nick changes allowed in the specified period */
1058 >        /* nick flood: the number of nick changes allowed in the specified period */
1059          max_nick_time = 20 seconds;
1060          max_nick_changes = 5;
1061  
# Line 1003 | Line 1067 | general {
1067  
1068          /*
1069           * ts delta: the time delta allowed between server clocks before
1070 <         * a warning is given, or before the link is dropped.  all servers
1070 >         * a warning is given, or before the link is dropped. All servers
1071           * should run ntpdate/rdate to keep clocks in sync
1072           */
1073          ts_warn_delta = 30 seconds;
1074          ts_max_delta = 5 minutes;
1075  
1076          /*
1013         * kline_with_reason: show the user the reason why they are k/d/glined
1014         * on exit.  May give away who set k/dline when set via tcm.
1015         */
1016        kline_with_reason = yes;
1017
1018        /*
1019         * kline_reason: show this message to users on channel
1020         * instead of the oper reason.
1021         */
1022        kline_reason = "Connection closed";
1023
1024        /*
1025         * reject_hold_time: wait this amount of time before disconnecting
1026         * a rejected client. Use 0 to disable.
1027         */
1028        reject_hold_time = 0;
1029
1030        /*
1077           * warn_no_nline: warn opers about servers that try to connect but
1078 <         * we don't have a connect {} block for.  Twits with misconfigured
1079 <         * servers can get really annoying with this enabled.
1078 >         * for which we don't have a connect {} block. Twits with misconfigured
1079 >         * servers can become really annoying with this enabled.
1080           */
1081          warn_no_nline = yes;
1082  
1083          /*
1084           * stats_e_disabled: set this to 'yes' to disable "STATS e" for both
1085 <         * operators and administrators.  Doing so is a good idea in case
1085 >         * operators and administrators. Doing so is a good idea in case
1086           * there are any exempted (exempt{}) server IPs you don't want to
1087           * see leaked.
1088           */
# Line 1048 | Line 1094 | general {
1094          /* stats_P_oper_only: make stats P (ports) oper only */
1095          stats_P_oper_only = yes;
1096  
1097 +        /* stats_u_oper_only: make stats u (uptime) oper only */
1098 +        stats_u_oper_only = no;
1099 +
1100          /*
1101 <         * stats i oper only: make stats i (auth {}) oper only. set to:
1102 <         *     yes:    show users no auth blocks, made oper only.
1103 <         *     masked: show users first matching auth block
1104 <         *     no:     show users all auth blocks.
1101 >         * stats i oper only: make stats i (auth {}) oper only. Set to:
1102 >         *     yes    - show users no auth blocks, made oper only.
1103 >         *     masked - show users the first matching auth block
1104 >         *     no     - show users all auth blocks.
1105           */
1106          stats_i_oper_only = yes;
1107  
1108          /*
1109 <         * stats_k_oper_only: make stats k/K (klines) oper only.  set to:
1110 <         *     yes:    show users no auth blocks, made oper only
1111 <         *     masked: show users first matching auth block
1112 <         *     no:     show users all auth blocks.
1109 >         * stats_k_oper_only: make stats k/K (klines) oper only. Set to:
1110 >         *     yes    - show users no auth blocks, made oper only
1111 >         *     masked - show users the first matching auth block
1112 >         *     no     - show users all auth blocks.
1113           */
1114          stats_k_oper_only = yes;
1115  
# Line 1077 | Line 1126 | general {
1126          opers_bypass_callerid = no;
1127  
1128          /*
1129 <         * pace_wait_simple: time between use of less intensive commands
1129 >         * pace_wait_simple: minimum time required between use of less
1130 >         * intensive commands
1131           * (ADMIN, HELP, (L)USERS, VERSION, remote WHOIS)
1132           */
1133          pace_wait_simple = 1 second;
1134  
1135          /*
1136 <         * pace_wait: time between more intensive commands
1136 >         * pace_wait: minimum time required between use of more intensive commands
1137           * (AWAY, INFO, LINKS, MAP, MOTD, STATS, WHO, wildcard WHOIS, WHOWAS)
1138           */
1139          pace_wait = 10 seconds;
1140  
1141          /*
1142 <         * short_motd: send clients a notice telling them to read the motd
1143 <         * instead of forcing a motd to clients who may simply ignore it.
1142 >         * short_motd: send clients a notice telling them to read the MOTD
1143 >         * instead of forcing an MOTD to clients who may simply ignore it.
1144           */
1145          short_motd = no;
1146  
# Line 1105 | Line 1155 | general {
1155  
1156          /*
1157           * true_no_oper_flood: completely eliminate flood limits for opers
1158 <         * and for clients with can_flood = yes in their auth {} blocks
1158 >         * and for clients with can_flood = yes in their auth {} blocks.
1159           */
1160          true_no_oper_flood = yes;
1161  
1162 <        /* oper_pass_resv: allow opers to over-ride RESVs on nicks/channels */
1162 >        /* oper_pass_resv: allow opers to over-ride RESVs on nicks/channels. */
1163          oper_pass_resv = yes;
1164  
1165 <        /* REMOVE ME.  The following line checks you've been reading. */
1165 >        /* REMOVE ME. The following line checks that you have been reading. */
1166          havent_read_conf = 1;
1167  
1168          /*
1169 <         * max_targets: the maximum amount of targets in a single
1170 <         * PRIVMSG/NOTICE.  Set to 999 NOT 0 for unlimited.
1169 >         * max_targets: the maximum number of targets in a single
1170 >         * PRIVMSG/NOTICE. Set to 999 NOT 0 for unlimited.
1171           */
1172          max_targets = 4;
1173  
1174          /*
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        /*
1175           * usermodes configurable: a list of usermodes for the options below
1176           *
1177           * +b - bots         - See bot and drone flooding notices
1178           * +c - cconn        - Client connection/quit notices
1137         * +C - cconn_full   - Client connection/quit notices full
1179           * +D - deaf         - Don't receive channel messages
1180           * +d - debug        - See debugging notices
1181 +         * +e - external     - See remote server connection and split notices
1182 +         * +F - farconnect   - Remote client connection/quit notices
1183           * +f - full         - See auth{} block full notices
1184           * +G - softcallerid - Server Side Ignore for users not on your channels
1185           * +g - callerid     - Server Side Ignore (for privmsgs etc)
1186           * +H - hidden       - Hides operator status to other users
1187 <         * +i - invisible    - Not shown in NAMES or WHO unless you share a
1145 <         *                     a channel
1187 >         * +i - invisible    - Not shown in NAMES or WHO unless you share a channel
1188           * +j - rej          - See rejected client notices
1189           * +k - skill        - See server generated KILL messages
1190           * +l - locops       - See LOCOPS messages
1191           * +n - nchange      - See client nick changes
1192 +         * +R - nononreg     - Only receive private messages from registered clients
1193           * +s - servnotice   - See general server notices
1194           * +u - unauth       - See unauthorized client notices
1195           * +w - wallop       - See server generated WALLOPS
1153         * +x - external     - See remote server connection and split notices
1196           * +y - spy          - See LINKS, STATS, TRACE notices etc.
1197           * +z - operwall     - See oper generated WALLOPS
1198           */
1199  
1200          /* oper_only_umodes: usermodes only opers may set */
1201 <        oper_only_umodes = bots, cconn, cconn_full, debug, full, hidden, skill,
1202 <                           nchange, rej, spy, external, operwall,
1203 <                           locops, unauth;
1201 >        oper_only_umodes = bots, cconn, debug, full, hidden, skill,
1202 >                        nchange, rej, spy, external, operwall,
1203 >                        locops, unauth, farconnect;
1204  
1205          /* oper_umodes: default usermodes opers get when they /oper */
1206          oper_umodes = bots, locops, servnotice, operwall, wallop;
1207  
1208          /*
1209           * use_egd: if your system does not have *random devices yet you
1210 <         * want to use OpenSSL and encrypted links, enable this.  Beware -
1211 <         * EGD is *very* CPU intensive when gathering data for its pool
1210 >         * want to use OpenSSL and encrypted links, enable this. Beware -
1211 >         * EGD is *very* CPU intensive when gathering data for its pool.
1212           */
1213   #       use_egd = yes;
1214  
# Line 1177 | Line 1219 | general {
1219   #       egdpool_path = "/var/run/egd-pool";
1220  
1221          /*
1222 <         * throttle_time: the minimum amount of time between connections from
1223 <         * the same ip.  exempt {} blocks are excluded from this throttling.
1224 <         * Offers protection against flooders who reconnect quickly.  
1222 >         * throttle_time: the minimum amount of time required between
1223 >         * connections from the same IP address. exempt {} blocks are excluded
1224 >         * from this throttling.
1225 >         * Offers protection against flooders who reconnect quickly.
1226           * Set to 0 to disable.
1227           */
1228          throttle_time = 10;
# Line 1193 | Line 1236 | modules {
1236          path = "/usr/local/ircd/lib/ircd-hybrid/modules";
1237          path = "/usr/local/ircd/lib/ircd-hybrid/modules/autoload";
1238  
1239 <        /* module: the name of a module to load on startup/rehash */
1240 <        #module = "some_module.la";
1239 >        /* module: the name of a module to load on startup/rehash. */
1240 > #       module = "some_module.la";
1241   };
1242  
1243   /*
# Line 1206 | Line 1249 | log {
1249  
1250          file {
1251                  type = oper;
1252 <                name = "/home/ircd/var/log/oper.log";
1252 >                name = "/usr/local/ircd/var/log/oper.log";
1253                  size = unlimited;
1254          };
1255  
1256          file {
1257                  type = user;
1258 <                name = "/home/ircd/var/log/user.log";
1258 >                name = "/usr/local/ircd/var/log/user.log";
1259                  size = 50 megabytes;
1260          };
1261  
1262          file {
1263                  type = kill;
1264 <                name = "/home/ircd/var/log/kill.log";
1264 >                name = "/usr/local/ircd/var/log/kill.log";
1265                  size = 50 megabytes;
1266          };
1267  
1268          file {
1269                  type = kline;
1270 <                name = "/home/ircd/var/log/kline.log";
1270 >                name = "/usr/local/ircd/var/log/kline.log";
1271                  size = 50 megabytes;
1272          };
1273  
1274          file {
1275                  type = dline;
1276 <                name = "/home/ircd/var/log/dline.log";
1276 >                name = "/usr/local/ircd/var/log/dline.log";
1277                  size = 50 megabytes;
1278          };
1279  
1280          file {
1281                  type = gline;
1282 <                name = "/home/ircd/var/log/gline.log";
1282 >                name = "/usr/local/ircd/var/log/gline.log";
1283 >                size = 50 megabytes;
1284 >        };
1285 >
1286 >        file {
1287 >                type = xline;
1288 >                name = "/usr/local/ircd/var/log/xline.log";
1289 >                size = 50 megabytes;
1290 >        };
1291 >
1292 >        file {
1293 >                type = resv;
1294 >                name = "/usr/local/ircd/var/log/resv.log";
1295                  size = 50 megabytes;
1296          };
1297  
1298          file {
1299                  type = debug;
1300 <                name = "/home/ircd/var/log/debug.log";
1300 >                name = "/usr/local/ircd/var/log/debug.log";
1301                  size = 50 megabytes;
1302 <        };
1302 >        };
1303   };

Diff Legend

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