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

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

Diff Legend

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