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

Comparing:
ircd-hybrid-8/doc/example.conf (file contents), Revision 1441 by michael, Wed Jun 20 19:05:27 2012 UTC vs.
ircd-hybrid/branches/8.2.x/doc/reference.conf (file contents), Revision 5810 by michael, Thu Apr 23 17:27:17 2015 UTC

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

Diff Legend

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