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

Comparing ircd-hybrid/trunk/doc/reference.conf (file contents):
Revision 2322 by michael, Sun Jun 23 12:01:30 2013 UTC vs.
Revision 6668 by michael, Mon Oct 26 19:47:50 2015 UTC

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

Diff Legend

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