Less CoreExport.. Too much of a good thing..

[user/henk/code/inspircd.git] / conf / links.conf.example

diff --git a/conf/links.conf.example b/conf/links.conf.example
index e304cd0e658e7c0d0bef51c0510c1042808f8c1d..1b85d6d2b49dabaab3f4e662fe50120711029834 100644 (file)
--- a/conf/links.conf.example
+++ b/conf/links.conf.example
@@ -17,20 +17,19 @@
 #  information on how to load this module! If you do not load this    #
 #  module, server links will NOT work!                                #
 #                                                                     #
-#  Also, if you define any transports, you must load the modules for  #
-#  these transports BEFORE you load m_spanningtree, e.g. place them   #
-#  above it in the configuration file. Currently this means the three #
-#  modules m_ssl_gnutls, m_ziplinks and m_ssl_openssl, depending on   #
-#  which you choose to use.                                           #
 #                                                                     #
 
-<link name="hub.penguin.org"
+<link
+      # name: The name of the remote server. This must match
+      # the <server:name> value of the remote server.
+      name="hub.penguin.org"
 
-      # ipaddr: The IP address of the remote server. 
+      # ipaddr: The IP address of the remote server.
       # Can also be a hostname, but hostname must resolve.
       ipaddr="penguin.box.com"
 
-      # port: the port to connect to this server on
+      # port: The port to connect to the server on.
+      # It must be bound as a server port on the other server.
       port="7000"
 
       # allowmask: Range of IP addresses to allow for this link.
@@ -41,21 +40,28 @@
       # to remote server (in seconds).
       autoconnect="300"
 
-      # failover: If defined, if this link fails, 
+      # failover: If defined, if this link fails,
       # what is the next link that is tried.
       failover="hub.other.net"
 
       # timeout: If defined, this option defines how long the server
       # will wait to consider the connect attempt failed and try the
       # failover (see above).
-      timeout="15"
+      timeout="300"
+
+      # fingerprint: If defined, this option will force servers to be
+      # authenticated using SSL Fingerprints. For more information,
+      # see http://wiki.inspircd.org/SSL
+      #fingerprint=""
 
-      # transport: If defined, this states extra modules that can be
+      # ssl: If defined, this states extra modules that can be
       # used in the connection. Options are: "openssl" and "gnutls"
       # for encryption (they are compatible with each other) and
-      # "zip" for compression. You must use the same (or a compa-
-      # tible) transport on both sides of the link.
-      transport="gnutls"
+      # "ziplinks" for compression. You must use the same (or a
+      # compatible) transport on both sides of the link.
+      # You will need to load the m_ssl_openssl.so module for openssl,
+      # m_ssl_gnutls.so for gnutls or m_ziplinks.so for ziplinks.
+      ssl="gnutls"
 
       # bind: Local IP address to bind to.
       bind="1.2.3.4"
@@ -81,8 +87,8 @@
       allowmask="69.58.44.0/24"
       autoconnect="300"
       failover="hub.other.net"
-      timeout="15"
-      transport="gnutls"
+      timeout="300"
+      ssl="gnutls"
       bind="1.2.3.4"
       statshidden="no"
       hidden="no"