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-7.2/etc/example.conf.in (file contents), Revision 897 by db, Sat Nov 3 17:13:32 2007 UTC vs.
ircd-hybrid/trunk/doc/reference.conf (file contents), Revision 4436 by michael, Thu Aug 7 20:42:37 2014 UTC

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

Comparing:
ircd-hybrid-7.2/etc/example.conf.in (property svn:keywords), Revision 897 by db, Sat Nov 3 17:13:32 2007 UTC vs.
ircd-hybrid/trunk/doc/reference.conf (property svn:keywords), Revision 4436 by michael, Thu Aug 7 20:42:37 2014 UTC

# Line 1 | Line 1
1 < "Author Date Id Revision"
1 > Id Revision

Diff Legend

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