X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/f0bce9d95d1b193ac69c3dd589ed0646d9b39361..6292d72bbffc2035d404a0b1d7659fe73b96b410:/doc/reference.conf diff --git a/doc/reference.conf b/doc/reference.conf old mode 100755 new mode 100644 index ae07abfe..592380af --- a/doc/reference.conf +++ b/doc/reference.conf @@ -6,7 +6,6 @@ * * Written by ejb, wcampbel, db, leeh and others * - * $Id: reference.conf 3582 2007-11-17 21:55:48Z jilles $ */ /* IMPORTANT NOTES: @@ -29,76 +28,94 @@ * * Times/durations are written as: * 12 hours 30 minutes 1 second - * + * * Valid units of time: * month, week, day, hour, minute, second * * Valid units of size: * megabyte/mbyte/mb, kilobyte/kbyte/kb, byte * - * Sizes and times may be singular or plural. - */ + * Sizes and times may be singular or plural. + */ /* Extensions: * * Charybdis contains several extensions that are not enabled by default. * To use them, uncomment the lines below. * - * Channel mode +-A (admin only) -- chm_adminonly.so - * Channel mode +-O (oper only) -- chm_operonly.so - * Channel mode +-S (ssl only) -- chm_sslonly.so - * Emulates channel mode +-O (oper only) (+-iI $o) -- chm_operonly_compat.so - * Emulates channel mode +-R (quiet unreg) (+-q $~a) -- chm_quietunreg_compat.so - * Emulates channel mode +-S (ssl only) (+-b $~z) -- chm_sslonly_compat.so - * Restrict channel creation to logged in users -- createauthonly.so - * Account bans (+b $a[:mask]) -- extb_account.so - * Banned from another channel (+b $j:mask) -- extb_canjoin.so - * Other-channel bans (+b $c:mask) -- extb_channel.so - * Extended ban (+b $x:mask) -- extb_extgecos.so - * Oper bans (+b $o) -- extb_oper.so - * Realname (gecos) bans (+b $r:mask) -- extb_realname.so - * Server bans (+b $s:mask) -- extb_server.so - * SSL bans (+b $z) -- extb_ssl.so - * HURT system -- hurt.so - * New host mangling (umode +x) -- ip_cloaking_4.0.so - * Old host mangling (umode +h) -- ip_cloaking.so - * Find channel forwards -- m_findforwards.so - * /identify support -- m_identify.so - * Opers cannot be invisible (umode +i) -- no_oper_invis.so - * Far connection notices (snomask +F) -- sno_farconnect.so - * Remote k/d/x line active notices -- sno_globalkline.so - * Remote oper up notices -- sno_globaloper.so - * /whois notifications (snomask +W) -- sno_whois.so - * Oper-override (modehacking only) -- override.so - * Stop services kills -- m_nokillservices.so + * Channel mode +-A (admin only) -- chm_adminonly + * Channel mode +-T (blocks notices) -- chm_nonotice + * Channel mode +-O (oper only) -- chm_operonly + * Channel mode +-S (ssl only) -- chm_sslonly + * Emulates channel mode +-O (oper only) (+-iI $o) -- chm_operonly_compat + * Emulates channel mode +-R (quiet unreg) (+-q $~a) -- chm_quietunreg_compat + * Emulates channel mode +-S (ssl only) (+-b $~z) -- chm_sslonly_compat + * Channel mode +-M (disallow KICK on IRC ops) -- chm_operpeace + * Restrict channel creation to logged in users -- createauthonly + * Account bans (+b $a[:mask]) -- extb_account + * Banned from another channel (+b $j:mask) -- extb_canjoin + * Other-channel bans (+b $c:mask) -- extb_channel + * Combination extbans -- extb_combi + * Extended ban (+b $x:mask) -- extb_extgecos + * Hostmask bans (for combination extbans) -- extb_hostmask + * Oper bans (+b $o) -- extb_oper + * Realname (gecos) bans (+b $r:mask) -- extb_realname + * Server bans (+b $s:mask) -- extb_server + * SSL bans (+b $z) -- extb_ssl + * User mode bans (+b $u:modes) -- extb_usermode + * Helpops system (umode +H) -- helpops + * HURT system -- hurt + * New host mangling (umode +x) -- ip_cloaking_4.0 + * Old host mangling (umode +h) -- ip_cloaking + * Dynamically extend channel limits -- m_extendchans + * Find channel forwards -- m_findforwards + * /identify support -- m_identify + * /locops support -- m_locops + * Opers cannot be invisible (umode +i) -- no_oper_invis + * Far connection notices (snomask +F) -- sno_farconnect + * Remote k/d/x line active notices -- sno_globalkline + * Remote oper up notices -- sno_globaloper + * Global nick-change notices -- sno_globalnickchange + * /whois notifications (snomask +W) -- sno_whois + * Oper-override (modehacking only) -- override + * Stop services kills -- no_kill_services */ -#loadmodule "extensions/chm_adminonly.so"; -#loadmodule "extensions/chm_operonly.so"; -#loadmodule "extensions/chm_sslonly.so"; -#loadmodule "extensions/chm_operonly_compat.so"; -#loadmodule "extensions/chm_quietunreg_compat.so"; -#loadmodule "extensions/chm_sslonly_compat.so"; -#loadmodule "extensions/createauthonly.so"; -#loadmodule "extensions/extb_account.so"; -#loadmodule "extensions/extb_canjoin.so"; -#loadmodule "extensions/extb_channel.so"; -#loadmodule "extensions/extb_extgecos.so"; -#loadmodule "extensions/extb_oper.so"; -#loadmodule "extensions/extb_realname.so"; -#loadmodule "extensions/extb_server.so"; -#loadmodule "extensions/extb_ssl.so"; -#loadmodule "extensions/hurt.so"; -#loadmodule "extensions/ip_cloaking_4.0.so"; -#loadmodule "extensions/ip_cloaking.so"; -#loadmodule "extensions/m_findforwards.so"; -#loadmodule "extensions/m_identify.so"; -#loadmodule "extensions/no_oper_invis.so"; -#loadmodule "extensions/sno_farconnect.so"; -#loadmodule "extensions/sno_globalkline.so"; -#loadmodule "extensions/sno_globaloper.so"; -#loadmodule "extensions/sno_whois.so"; -#loadmodule "extensions/override.so"; -#loadmodule "extensions/m_nokillservices.so"; +#loadmodule "extensions/chm_adminonly"; +#loadmodule "extensions/chm_nonotice"; +#loadmodule "extensions/chm_operonly"; +#loadmodule "extensions/chm_sslonly"; +#loadmodule "extensions/chm_operonly_compat"; +#loadmodule "extensions/chm_quietunreg_compat"; +#loadmodule "extensions/chm_sslonly_compat"; +#loadmodule "extensions/chm_operpeace"; +#loadmodule "extensions/createauthonly"; +#loadmodule "extensions/extb_account"; +#loadmodule "extensions/extb_canjoin"; +#loadmodule "extensions/extb_channel"; +#loadmodule "extensions/extb_combi"; +#loadmodule "extensions/extb_extgecos"; +#loadmodule "extensions/extb_hostmask"; +#loadmodule "extensions/extb_oper"; +#loadmodule "extensions/extb_realname"; +#loadmodule "extensions/extb_server"; +#loadmodule "extensions/extb_ssl"; +#loadmodule "extensions/extb_usermode"; +#loadmodule "extensions/helpops"; +#loadmodule "extensions/hurt"; +#loadmodule "extensions/ip_cloaking_4.0"; +#loadmodule "extensions/ip_cloaking"; +#loadmodule "extensions/m_extendchans"; +#loadmodule "extensions/m_findforwards"; +#loadmodule "extensions/m_identify"; +#loadmodule "extensions/m_locops"; +#loadmodule "extensions/no_oper_invis"; +#loadmodule "extensions/sno_farconnect"; +#loadmodule "extensions/sno_globalkline"; +#loadmodule "extensions/sno_globalnickchange"; +#loadmodule "extensions/sno_globaloper"; +#loadmodule "extensions/sno_whois"; +#loadmodule "extensions/override"; +#loadmodule "extensions/no_kill_services"; /* serverinfo {}: Contains information about the server. (OLD M:) */ serverinfo { @@ -122,32 +139,31 @@ serverinfo { * is on. Shown in the 005 reply and used with serverhiding. */ network_name = "MyNet"; - network_desc = "This is My Network"; - - /* hub: allow this server to act as a hub and have multiple servers - * connected to it. - */ - hub = no; /* vhost: the IP to bind to when we connect outward to ipv4 servers. * This should be an ipv4 IP only. */ - #vhost = "192.169.0.1"; + #vhost = "192.0.2.6"; /* vhost6: the IP to bind to when we connect outward to ipv6 servers. * This should be an ipv6 IP only. */ - #vhost6 = "3ffe:80e8:546::2"; - - /* ssl_private_key: our ssl private key */ - ssl_private_key = "etc/ssl.key"; + #vhost6 = "2001:db8:2::6"; + + /* ssl_cert: certificate (and optionally key) for our ssl server */ + ssl_cert = "etc/ssl.pem"; - /* ssl_cert: certificate for our ssl server */ - ssl_cert = "etc/ssl.cert"; + /* ssl_private_key: our ssl private key (if not contained in ssl_cert file) */ + #ssl_private_key = "etc/ssl.key"; - /* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 1024 */ + /* ssl_dh_params: DH parameters, generate with openssl dhparam -out dh.pem 2048 */ + /* If you do not provide parameters, some TLS backends will fail on DHE- ciphers, + and some will succeed but use weak, common DH groups! */ ssl_dh_params = "etc/dh.pem"; + /* ssl_cipher_list: A list of ciphers, dependent on your TLS backend */ + #ssl_cipher_list = "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL"; + /* ssld_count: number of ssld processes you want to start, if you * have a really busy server, using N-1 where N is the number of * cpu/cpu cores you have might be useful. A number greater than one @@ -237,7 +253,7 @@ class "users" { */ cidr_ipv6_bitlen = 64; - /* number_per_cidr: Number of connections to allow from a subnet of the + /* number_per_cidr: Number of connections to allow from a subnet of the * size given in cidr_ipv4_bitlen/cidr_ipv6_bitlen. * 4 seems to be a good default to me. */ @@ -284,7 +300,7 @@ class "server" { max_number = 1; /* sendq: servers need a higher sendq as they are sent more data */ - sendq=2 megabytes; + sendq = 2 megabytes; }; /* listen {}: contain information about the ports ircd listens on (OLD P:) */ @@ -299,28 +315,34 @@ listen { /* port: the specific port to listen on. if no host is specified * before, it will listen on all available IPs. * - * sslport: the specific port to listen ssl connections on. if no + * sslport: the specific port to listen ssl connections on. if no * host is specified before, it will listen on all available IPs. * * ports are seperated via a comma, a range may be specified using ".." */ - + /* port: listen on all available IPs, ports 5000 and 6665 to 6669 */ port = 5000, 6665 .. 6669; - - /* sslport: listen for ssl connections on all available IPs, port 9999 */ - sslport = 9999; - /* host: set a specific IP/host the ports after the line will listen + /* sslport: listen for ssl connections on all available IPs, port 6697 */ + sslport = 6697; + + /* host: set a specific IP/host the ports after the line will listen * on. This may be ipv4 or ipv6. */ - host = "1.2.3.4"; + host = "192.0.2.6"; port = 7000, 7001; sslport = 9000, 9001; - host = "3ffe:1234:a:b:c::d"; + host = "2001:db8:2::6"; port = 7002; sslport = 9002; + + /* wsock: listeners defined with this option enabled will be websocket listeners, + * and will not accept normal clients. + */ + wsock = yes; + sslport = 9999; }; /* auth {}: allow users to connect to the ircd (OLD I:) */ @@ -331,8 +353,8 @@ auth { * prepending a 0 if it starts with a colon) and can also use CIDR * masks. */ - user = "*@172.16.0.0/12"; - user = "*test@123D:B567:*"; + user = "*@198.51.100.0/24"; + user = "*test@2001:db8:1:*"; /* auth_user: This allows specifying a username:password instead of * just a password in PASS, so that a fixed user@host is not @@ -345,7 +367,7 @@ auth { * flags = ...; below if it is. */ password = "letmein"; - + /* spoof: fake the users user@host to be be this. You may either * specify a host or a user@host to spoof to. This is free-form, * just do everyone a favour and dont abuse it. (OLD I: = flag) @@ -353,12 +375,14 @@ auth { spoof = "I.still.hate.packets"; /* Possible flags in auth: - * + * * encrypted | password is encrypted with mkpasswd * spoof_notice | give a notice when spoofing hosts * exceed_limit (old > flag) | allow user to exceed class user limits - * kline_exempt (old ^ flag) | exempt this user from k/g/xlines&dnsbls + * kline_exempt (old ^ flag) | exempt this user from k/g/xlines, + * | dnsbls, and proxies * dnsbl_exempt | exempt this user from dnsbls + * proxy_exempt | exempt this user from proxies * spambot_exempt | exempt this user from spambot checks * shide_exempt | exempt this user from serverhiding * jupe_exempt | exempt this user from generating @@ -370,9 +394,10 @@ auth { * need_ident (old + flag) | require ident for user in this class * need_ssl | require SSL/TLS for user in this class * need_sasl | require SASL id for user in this class + * extend_chans | allow this user to join more channels than normal */ flags = kline_exempt, exceed_limit; - + /* class: the class the user is placed in */ class = "opers"; }; @@ -382,10 +407,10 @@ auth { * not have to obey the redirection, the ircd just suggests to them * an alternative server. */ - redirserv = "irc.some.domain"; + redirserv = "irc.example.net"; redirport = 6667; - - user = "*.some.domain"; + + user = "*.example.com"; /* class: a class is required even though it is not used */ class = "users"; @@ -425,6 +450,7 @@ privset "local_op" { * oper:hidden: hides the oper from /stats p * oper:remoteban: allows remote kline etc * oper:mass_notice: allows sending wallops and mass notices + * oper:grant: allows using the GRANT command */ privs = oper:local_kill, oper:operwall; }; @@ -443,7 +469,7 @@ privset "global_op" { privset "admin" { extends = "global_op"; - privs = oper:admin, oper:die, oper:rehash, oper:spy; + privs = oper:admin, oper:die, oper:rehash, oper:spy, oper:grant; }; /* operator {}: defines ircd operators. (OLD O:) */ @@ -458,13 +484,13 @@ operator "god" { user = "*@127.0.0.1"; /* password: the password required to oper. Unless ~encrypted is - * contained in flags = ...; this will need to be encrypted using + * contained in flags = ...; this will need to be encrypted using * mkpasswd, MD5 is supported */ password = "etcnjl8juSU1E"; /* rsa key: the public key for this oper when using Challenge. - * A password should not be defined when this is used, see + * A password should not be defined when this is used, see * doc/challenge.txt for more information. */ #rsa_public_key_file = "/usr/local/ircd/etc/oper.pub"; @@ -509,12 +535,12 @@ connect "irc.uplink.com" { /* host: the host or IP to connect to. If a hostname is used it * must match the reverse dns of the server. */ - host = "192.168.0.1"; + host = "203.0.113.3"; /* vhost: the host or IP to bind to for this connection. If this * is not specified, the default vhost (in serverinfo {}) is used. */ - #vhost = "192.168.0.50"; + #vhost = "192.0.2.131"; /* passwords: the passwords we send (OLD C:) and accept (OLD N:). * The remote server will have these passwords reversed. @@ -522,9 +548,9 @@ connect "irc.uplink.com" { send_password = "password"; accept_password = "anotherpassword"; - /* fingerprint: if specified, the server's client certificate - * fingerprint will be checked against the specified fingerprint - * below. + /* fingerprint: if flags = ssl is specified, the server's + * certificate fingerprint will be checked against the fingerprint + * specified below. required if using flags = ssl. */ #fingerprint = "c77106576abf7f9f90cca0f63874a60f2e40a64b"; @@ -550,22 +576,20 @@ connect "irc.uplink.com" { * compressed - compress traffic via ziplinks * topicburst - burst topics between servers * ssl - ssl/tls encrypted server connections + * no-export - marks the link as a no-export link (not exported to other links) */ flags = compressed, topicburst; }; -connect "ipv6.some.server" { - /* Hosts that are IPv6 addresses must be in :: shortened form - * if applicable. Addresses starting with a colon get an extra - * zero prepended, for example: 0::1 - */ - host = "3ffd:dead:beef::1"; +connect "ipv6.lame.server" { + host = "192.0.2.1"; + host = "2001:db8:3::8"; send_password = "password"; accept_password = "password"; port = 6666; - /* aftype: controls whether the connection uses "ipv4" or "ipv6". - * Default is ipv4. + /* aftype: controls whether the outgoing connection uses "ipv4" or "ipv6". + * Default is to try either at random. */ aftype = ipv6; class = "server"; @@ -575,7 +599,7 @@ connect "ssl.uplink.com" { /* Example of ssl server-to-server connection, ssl flag doesn't need * compressed flag, 'cause it uses own compression */ - host = "192.168.0.1"; + host = "203.0.113.129"; send_password = "password"; accept_password = "anotherpassword"; port = 9999; @@ -661,6 +685,9 @@ shared { * dline - allow setting perm/temp dlines * tdline - allow setting temp dlines * undline - allow removing dlines + * grant - allow granting operator status + * die - allow remote DIE/RESTART + * module - allow remote module commands * none - disallow everything */ @@ -684,11 +711,10 @@ shared { /* exempt {}: IPs that are exempt from Dlines and rejectcache. (OLD d:) */ exempt { - ip = "192.168.0.0/16"; + ip = "192.0.2.0/24"; /* these may be stacked */ ip = "127.0.0.1"; - ip = "10.0.0.0/8"; }; /* The channel block contains options pertaining to channels */ @@ -728,6 +754,9 @@ channel { /* max chans: The maximum number of channels a user can join/be on. */ max_chans_per_user = 15; + /* max chans (large): The extended maximum number of channels a user can join. */ + max_chans_per_user_large = 60; + /* max bans: maximum number of +b/e/I/q modes in a channel */ max_bans = 100; @@ -748,7 +777,7 @@ channel { default_split_user_count = 0; /* split servers: when the amount of servers that have acknowledged - * theyve finished bursting is lower than this, consider ourselves + * theyve finished bursting is lower than this, consider ourselves * split. this must be set for automatic splitmode */ default_split_server_count = 0; @@ -792,6 +821,20 @@ channel { * supported. */ disable_local_channels = no; + + /* autochanmodes: the channel modes that should be automatically set + * when a channel is created. + */ + autochanmodes = "+nt"; + + /* displayed_usercount: the minimum amount of users on a channel before it + * is displayed in LIST. this parameter can be overridden using ELIST parameters, + * such as LIST >0. + */ + displayed_usercount = 3; + + /* strip_topic_colors: whether or not color codes in TOPIC should be stripped. */ + strip_topic_colors = no; }; @@ -823,8 +866,7 @@ serverhide { * You can have multiple combinations of host and rejection reasons. * They are used in pairs of one host/rejection reason. * - * These settings should be adequate for most networks, and are (presently) - * required for use on StaticBox. + * These settings should be adequate for most networks. * * Word to the wise: Do not use blacklists like SPEWS for blocking IRC * connections. @@ -849,27 +891,15 @@ serverhide { * to match the final octet (e.g. 127.0.0.1) or "127.x.y.z" to explicitly match * an A record. The blacklist is only applied if it matches anything in the * list. You may freely mix full IP's and final octets. - * + * * Consult your blacklist provider for the meaning of these parameters; they * are usually used to denote different ban types. - * - * Note: AHBL (the providers of the below *.ahbl.org BLs) request that they be - * contacted, via email, at admins@2mbit.com before using these BLs. - * See for more information. */ blacklist { host = "rbl.efnetrbl.org"; type = ipv4; reject_reason = "${nick}, your IP (${ip}) is listed in EFnet's RBL. For assistance, see http://efnetrbl.org/?i=${ip}"; -# host = "ircbl.ahbl.org"; -# type = ipv4; -# reject_reason = "${nick}, your IP (${ip}) is listed in ${dnsbl-host} for having an open proxy. In order to protect ${network-name} from abuse, we are not allowing connections with open proxies to connect."; -# -# host = "tor.ahbl.org"; -# type = ipv4; -# reject_reason = "${nick}, your IP (${ip}) is listed as a TOR exit node. In order to protect ${network-name} from tor-based abuse, we are not allowing TOR exit nodes to connect to our network."; -# /* Example of a blacklist that supports both IPv4 and IPv6 and using matches */ # host = "foobl.blacklist.invalid"; # matches = "4", "6", "127.0.0.10"; @@ -877,6 +907,78 @@ blacklist { # reject_reason = "${nick}, your IP (${ip}) is listed in ${dnsbl-host} for some reason. In order to protect ${network-name} from abuse, we are not allowing connections listed in ${dnsbl-host} to connect"; }; +/* These are the OPM settings. + * This is similar to the functionality provided by BOPM. It will scan incoming + * connections for open proxies by connecting to clients and attempting several + * different open proxy handshakes. If they connect back to us (via a dedicated + * listening port), and send back the data we send them, they are considered + * an open proxy. For politeness reasons (users may be confused by the incoming + * connection attempts if they are logging incoming connections), the user is + * notified upon connect if they are being scanned. + * + * WARNING: + * These settings are considered experimental. Only the most common proxy types + * are checked for (Charybdis is immune from POST and GET proxies). If you are + * not comfortable with experimental code, do not use this feature. + */ +#opm { + /* IPv4 address to listen on. This must be a publicly facing IP address + * to be effective. + * If omitted, it defaults to serverinfo::vhost. + */ + #listen_ipv4 = "127.0.0.1"; + + /* IPv4 port to listen on. + * This should not be the same as any existing listeners. + */ + #port_v4 = 32000; + + /* IPv6 address to listen on. This must be a publicly facing IP address + * to be effective. + * If omitted, it defaults to serverinfo::vhost6. + */ + #listen_ipv6 = "::1"; + + /* IPv6 port to listen on. + * This should not be the same as any existing listeners. + */ + #port_v6 = 32000; + + /* You can also set the listen_port directive which will set both the + * IPv4 and IPv6 ports at once. + */ + #listen_port = 32000; + + /* This sets the timeout in seconds before ending open proxy scans. + * Values less than 1 or greater than 60 are ignored. + * It is advisable to keep it as short as feasible, so clients do not + * get held up by excessively long scan times. + */ + #timeout = 5; + + /* These are the ports to scan for SOCKS4 proxies on. They may overlap + * with other scan types. Sensible defaults are given below. + */ + #socks4_ports = 80, 443, 1080, 8000, 8080, 10800; + + /* These are the ports to scan for SOCKS5 proxies on. They may overlap + * with other scan types. Sensible defaults are given below. + */ + #socks5_ports = 80, 443, 1080, 8000, 8080, 10800; + + /* These are the ports to scan for HTTP CONNECT proxies on (plaintext). + * They may overlap with other scan types. Sensible defaults are given + * below. + */ + #httpconnect_ports = 80, 8080, 8000; + + /* These are the ports to scan for HTTPS CONNECT proxies on (SSL). + * They may overlap with other scan types. Sensible defaults are given + * below. + */ + #httpsconnect_ports = 443, 4443; +#}; + /* * Alias blocks allow you to define custom commands. (Old m_sshortcut.c) * They send PRIVMSG to the given target. A real command takes @@ -940,8 +1042,6 @@ general { * If disabled, local opers can see them. * Dynamic spoofs (e.g. set by services) are unaffected by this; * any oper (local and remote) can see the real ip. - * Warning: for whowas, this is checked when the client exits, - * not when the IP is shown. */ hide_spoof_ips = yes; @@ -970,6 +1070,14 @@ general { */ servicestring = "is a Network Service"; + /* + * Nick of the network's SASL agent. Used to check whether services are here, + * SASL credentials are only sent to its server. Needs to be a service. + * + * Defaults to SaslServ if unspecified. + */ + sasl_service = "SaslServ"; + /* disable fake channels: disable local users joining fake versions * of channels, eg #foo^B^B. Disables bold, mirc colour, reverse, * underline and hard space. (ASCII 2, 3, 22, 31, 160 respectively). @@ -987,7 +1095,7 @@ general { */ default_floodcount = 10; - /* failed oper notice: send a notice to all opers on the server when + /* failed oper notice: send a notice to all opers on the server when * someone tries to OPER and uses the wrong password, host or ident. */ failed_oper_notice = yes; @@ -995,7 +1103,7 @@ general { /* dots in ident: the amount of '.' characters permitted in an ident * reply before the user is rejected. */ - dots_in_ident=2; + dots_in_ident = 2; /* min nonwildcard: the minimum non wildcard characters in k/d/g lines * placed via the server. klines hand placed are exempt from limits. @@ -1059,23 +1167,22 @@ general { * displayed unconditionally. */ global_snotices = yes; - - /* dline reason: show the user the dline reason when they connect + + /* dline reason: show the user the dline reason when they connect * and are dlined. */ dline_with_reason = yes; - - /* kline delay: delay the checking of klines until a specified time. - * Useful if large kline lists are applied often to prevent the - * server eating CPU. - */ - kline_delay = 0 seconds; - /* kline reason: show the user the reason why they are k/dlined + /* kline reason: show the user the reason why they are k/dlined * on exit. may give away who set k/dline when set via tcm. */ kline_with_reason = yes; + /* tkline duration: when showing users their k/dline reason (see + * kline_with_reason), don't add "Temporary K-line 123 min." + */ + hide_tkdline_duration = no; + /* kline reason: make the users quit message on channels this * reason instead of the oper's reason. */ @@ -1093,7 +1200,7 @@ general { non_redundant_klines = yes; /* warn no nline: warn opers about servers that try to connect but - * we dont have a connect {} block for. Twits with misconfigured + * we dont have a connect {} block for. Twits with misconfigured * servers can get really annoying with this enabled. */ warn_no_nline = yes; @@ -1111,36 +1218,36 @@ general { stats_e_disabled = no; /* stats c oper only: make stats c (connect {}) oper only */ - stats_c_oper_only=no; + stats_c_oper_only = no; /* stats h oper only: make stats h (hub_mask/leaf_mask) oper only */ - stats_h_oper_only=no; + stats_h_oper_only = no; /* stats y oper only: make stats y (class {}) oper only */ - stats_y_oper_only=no; + stats_y_oper_only = no; /* stats o oper only: make stats o (opers) oper only */ - stats_o_oper_only=yes; + stats_o_oper_only = yes; /* stats P oper only: make stats P (ports) oper only - * NOTE: users doing stats P will never be given the ips that the + * NOTE: users doing stats P will never be given the ips that the * server listens on, simply the ports. */ - stats_P_oper_only=no; + stats_P_oper_only = no; /* stats i oper only: make stats i (auth {}) oper only. set to: * yes: show users no auth blocks, made oper only. * masked: show users first matching auth block * no: show users all auth blocks. */ - stats_i_oper_only=masked; + stats_i_oper_only = masked; /* stats k/K oper only: make stats k/K (klines) oper only. set to: * yes: show users no auth blocks, made oper only * masked: show users first matching auth block * no: show users all auth blocks. */ - stats_k_oper_only=masked; + stats_k_oper_only = masked; /* map oper only: make /map oper only */ map_oper_only = no; @@ -1197,8 +1304,8 @@ general { /* REMOVE ME. The following line checks you've been reading. */ havent_read_conf = yes; - - /* max targets: the maximum amount of targets in a single + + /* max targets: the maximum amount of targets in a single * PRIVMSG/NOTICE. set to 999 NOT 0 for unlimited. */ max_targets = 4; @@ -1212,7 +1319,7 @@ general { * * +g - callerid - Server Side Ignore * +D - deaf - Don't see channel messages - * +i - invisible - Not shown in NAMES or WHO unless you share a + * +i - invisible - Not shown in NAMES or WHO unless you share a * a channel * +l - locops - See LOCOPS messages * +Q - noforward - Unaffected by channel forwarding @@ -1221,7 +1328,7 @@ general { * +w - wallop - See oper and server generated WALLOPS * +z - operwall - See operwalls */ - + /* oper only umodes: usermodes only opers may set */ oper_only_umodes = operwall, locops, servnotice; @@ -1232,20 +1339,8 @@ general { * provided they have umode +s set */ oper_snomask = "+s"; - /* use egd: if your system does not have *random devices yet you - * want to use OpenSSL and encrypted links, enable this. Beware - - * EGD is *very* CPU intensive when gathering data for its pool - */ - #use_egd = yes; - - /* egdpool path: path to EGD pool. Not necessary for OpenSSL >= 0.9.7 - * which automatically finds the path. - */ - #egdpool_path = "/var/run/egd-pool"; - - /* compression level: level of compression for compressed links between - * servers. + * servers. * * values are between: 1 (least compression, fastest) * and: 9 (most compression, slowest). @@ -1314,15 +1409,34 @@ general { * counts. */ away_interval = 30; + + /* certfp_method: the method that should be used for computing certificate fingerprints. + * Acceptable options are sha1, sha256, spki_sha256, sha512 and spki_sha512. Networks + * running versions of charybdis prior to charybdis 3.5 MUST use sha1 for certfp_method. + * + * The spki_* variants operate on the SubjectPublicKeyInfo of the certificate, which does + * not change unless the private key is changed. This allows the fingerprint to stay + * constant even if the certificate is reissued. These fingerprints will be prefixed with + * "SPKI:SHA2-256:" or "SPKI:SHA2-512:" depending on the hash type. These fingerprints + * are not supported on servers running charybdis 3.5.3 or earlier. + * + * To generate a fingerprint from a certificate file, please use the mkfingerprint utility + * program located in the bin/ subdirectory of your IRCd installation. Running it with no + * arguments will give you a brief usage message; it takes method and filename arguments. + */ + certfp_method = spki_sha256; + + /* hide_opers_in_whois: if set to YES, then oper status will be hidden in /WHOIS output. */ + hide_opers_in_whois = no; }; modules { - /* module path: paths to search for modules specified below and + /* module path: paths to search for modules specified below and * in /modload. */ path = "/usr/local/ircd/modules"; path = "/usr/local/ircd/modules/autoload"; /* module: the name of a module to load on startup/rehash */ - #module = "some_module.so"; + #module = "some_module"; };