[sslproc] Use certificate file if key file is not present

[solanum.git] / doc / ircd.conf.example

diff --git a/doc/ircd.conf.example b/doc/ircd.conf.example
index 0ad8bf32b5ad247fc6bd9475603c67c2cded7121..1e11bd6ff3ed0c80a61a74543c089b2462ba3865 100644 (file)
--- a/doc/ircd.conf.example
+++ b/doc/ircd.conf.example
@@ -28,6 +28,7 @@
 #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";
@@ -309,10 +310,6 @@ connect "irc.uplink.com" {
        flags = compressed, topicburst;
 
        #fingerprint = "c77106576abf7f9f90cca0f63874a60f2e40a64b";
-
-       /* If the connection is IPv6, uncomment below.
-        * Use 0::1, not ::1, for IPv6 localhost. */
-       #aftype = ipv6;
 };
 
 connect "ssl.uplink.com" {
@@ -432,11 +429,10 @@ blacklist {
  * notified upon connect if they are being scanned.
  *
  * WARNING:
- * These settings are considered experimental, and as of this writing, the
- * Charybdis scanner is not as comprehensive as the one available in HOPM. Only
- * basic SOCKS4 and SOCKS5 scanning is performed on a few well-known ports. You
- * may disable the open proxy scanning feature by deleting this block if you are
- * uncomfortable with this.
+ * 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, remove or comment out the *entire*
+ * block below to disable the proxy scanner.
  */
 opm {
        /* IPv4 address to listen on. This must be a publicly facing IP address
@@ -454,17 +450,24 @@ opm {
         * to be effective.
         * If omitted, it defaults to serverinfo::vhost6.
         */
-       #listen_ipv6 = "0::1";
+       #listen_ipv6 = "::1";
 
        /* IPv6 port to listen on.
         * This should not be the same as any existing listeners.
         */
        #port_ipv6 = 32000;
 
-       /* You can also set a port directive which will set both the IPv4 and
-        * IPv6 ports at once.
+       /* 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.
         */
-       port = 32000;
+       timeout = 5;
 
        /* These are the ports to scan for SOCKS4 proxies on. They may overlap
         * with other scan types. Sensible defaults are given below.
@@ -481,6 +484,12 @@ opm {
         * 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 "NickServ" {
@@ -546,7 +555,7 @@ general {
        tkline_expire_notices = no;
        default_floodcount = 10;
        failed_oper_notice = yes;
-       dots_in_ident=2;
+       dots_in_ident = 2;
        min_nonwildcard = 4;
        min_nonwildcard_simple = 3;
        max_accept = 100;
@@ -571,13 +580,13 @@ general {
        warn_no_nline = yes;
        use_propagated_bans = yes;
        stats_e_disabled = no;
-       stats_c_oper_only=no;
-       stats_h_oper_only=no;
-       stats_y_oper_only=no;
-       stats_o_oper_only=yes;
-       stats_P_oper_only=no;
-       stats_i_oper_only=masked;
-       stats_k_oper_only=masked;
+       stats_c_oper_only = no;
+       stats_h_oper_only = no;
+       stats_y_oper_only = no;
+       stats_o_oper_only = yes;
+       stats_P_oper_only = no;
+       stats_i_oper_only = masked;
+       stats_k_oper_only = masked;
        map_oper_only = no;
        operspy_admin_only = no;
        operspy_dont_care_user_info = no;
@@ -605,7 +614,7 @@ general {
        throttle_count = 4;
        max_ratelimit_tokens = 30;
        away_interval = 30;
-       certfp_method = sha1;
+       certfp_method = spki_sha256;
        hide_opers_in_whois = no;
 };