ircd: introduce 'no-export' links

[solanum.git] / doc / reference.conf

diff --git a/doc/reference.conf b/doc/reference.conf
index 41c3c9feb84fca6c9007bf7051fdf920c2d1cbb6..c499a365bda5caecbff1cb64700d847eb1953ce1 100644 (file)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -324,8 +324,8 @@ listen {
        /* 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;
+       /* 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.
@@ -337,6 +337,12 @@ listen {
        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:) */
@@ -570,6 +576,7 @@ 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;
 };
@@ -1412,7 +1419,12 @@ general {
         * 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.
+        * "SPKI:SHA2-256:" or "SPKI:SHA2-512:" depending on the hash type.  These fingerprints
+        * are not supported on servers running charybdis 3.5 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;