Miscellaneous bugfixes from recent commits, and a file omitted from last commit.

[ircu2.10.12-pk.git] / doc / example.conf

diff --git a/doc/example.conf b/doc/example.conf
index 95b37da7b88401c50a71b8f6094639a7c9ae685b..c652d17343d537bedee64b87e61bcb82b74a5dff 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -53,17 +53,20 @@
 # General {
 #         name = "servername";
 #         vhost = "virtualhost";
+#         resolver = "ipaddress";
 #         description = "description";
 #         numeric = numericnumber;
 # };
 #
-# <virtual host> must contain either a * or a valid IPv4 address in
-# dotted quad notation. (127.0.0.1) The address MUST be the address
-# of a physical interface on the host. This address is used for outgoing
-# connections only, see Port{} for listener virtual hosting.
-# If in doubt put a * or the IP of your primary interface here.
-# The server must be compiled with virtual hosting turned on to get this
-# to work correctly.
+# If present, <virtual host> must contain a valid address in dotted
+# quad or IPv6 numeric notation (127.0.0.1 or ::1).  The address MUST
+# be the address of a physical interface on the host.  This address is
+# used for outgoing connections if the Connect{} block does not
+# override it.  See Port{} for listener virtual hosting.  If in doubt,
+# leave it out.
+#
+# You may need to specify the resolver address if your compile
+# defaults to using IPv6 but your resolvers are all IPv4 hosts.
 #
 # Note that <server numeric> has to be unique on the network your server
 # is running on, must be between 0 and 4095, and is not updated on a rehash.
@@ -101,20 +104,14 @@ Admin {
 #  usermode = "+i";
 # };
 #
+# maxlinks should be set at either 0 or 1.
+#
 # <connect freq> applies only to servers, and specifies the frequency 
 # that the server tries to autoconnect. setting this to 0 will cause
 # the server to attempt to connect repeatedly with no delay until the 
 # <maximum links> condition is satisfied. This is a Bad Thing(tm).
 # Note that times can be specified as a number, or by giving something
 # like: 1 minutes 20 seconds, or 1*60+20.
-# Client {
-#  host = "user@host";
-#  ip = "ip@host";
-#  password = "password";
-#  class = "classname";
-# };
-#
-# <maximum links> should be set at either 0 or 1.
 #
 # Recommended server classes:
 # All your server uplinks you are not a hub for.
@@ -134,6 +131,23 @@ Class {
  sendq = 9000000;
 };
 
+# Client {
+#  username = "ident";
+#  host = "host";
+#  ip = "127.0.0.0/8";
+#  password = "password";
+#  class = "classname";
+#  maxlinks = 3;
+# };
+#
+# Everything in a Client block is optional.  If a username mask is
+# given, it must match the client's username from the IDENT protocol.
+# If a host mask is given, the client's hostname must resolve and
+# match the host mask.  If a CIDR-style IP mask is given, the client
+# must have an IP matching that range.  If maxlinks is given, it is
+# limits the number of matching clients allowed from a particular IP
+# address.
+#
 # Recommended client classes:
 # Client classes. 10 = locals; 2 = for all .net and .com that are not
 # in Europe; 1 = for everybody.
@@ -147,7 +161,7 @@ Class {
 Client
 {
  class = "Other";
- host = "*@*";
+ username = "*";
 };
 Class {
  name = "America";
@@ -422,17 +436,6 @@ UWorld {
 UWorld {
  name = "channels6.undernet.org";
 };
-Server {
- name = "Amsterdam.NL.Eu.UnderNet.org";
- mask = "*";
- hub = yes;
-};
-# An example just to make sure IRCnet doesn't get on undernet...
-Server {
- name = "*";
- mask = "eris.berkeley.edu";
- hub = yes;
-};
 
 # As of ircu2.10.05 is it possible to Jupe nicks. As per CFV-0095, the
 # following nicks must be juped, it is not allowed to jupe others as well.