[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 72101454f0f1604bbf17b56c6a11b02c6d5166ce..1e11bd6ff3ed0c80a61a74543c089b2462ba3865 100644 (file)
--- a/doc/ircd.conf.example
+++ b/doc/ircd.conf.example
@@ -310,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" {
@@ -435,8 +431,8 @@ blacklist {
  * 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, remove or comment out the block
- * below to disable the proxy scanner.
+ * 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,7 +450,7 @@ 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.
@@ -559,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;
@@ -584,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;
@@ -618,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;
 };