X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=conf%2Finspircd.conf.example;h=dab2519fb0d8f4df06730c49059db16aa05e0b68;hb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;hp=fa43280227cc667fa516acf62353493f0a67c551;hpb=76d29d4d591e35d2451e5c4f2260bd1f6d94e7c9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/conf/inspircd.conf.example b/conf/inspircd.conf.example
index fa4328022..dab2519fb 100644
--- a/conf/inspircd.conf.example
+++ b/conf/inspircd.conf.example
@@ -159,7 +159,7 @@
 # or m_ssl_gnutls for gnutls.
 
 <bind address="" port="7000,7001" type="servers">
-<bind address="1.2.3.4" port="7005" type="servers" transport="openssl">
+<bind address="1.2.3.4" port="7005" type="servers" ssl="openssl">
 
 
 #-#-#-#-#-#-#-#-#-#-  DIE/RESTART CONFIGURATION   -#-#-#-#-#-#-#-#-#-#-
@@ -207,6 +207,16 @@
 <connect deny="3ffe::0/32">
 
 <connect
+         # name: Name to use for this connect block. Mainly used for
+         # connect class inheriting.
+         name="secret"
+
+         # parent: This setting is to specify if this connect class
+         # inherits settings from any other. Put the other class's name
+         # in here to use its settings as a template - for example,  if
+         # you only want to adjust sendq and a password
+         parent="main"
+
          # allow: What IP addresses/hosts to allow for this block.
          allow="196.12.*"
 
@@ -229,25 +239,15 @@
          # disconnecting a user if they do not do anything on connect.
          # (Note, this is a client-side thing, if the client does not
          # send /nick, /user or /pass)
-         timeout="60"
-
-         # pingfreq: How often (in seconds) the server tries to ping connecting clients.
-         pingfreq="120"
+         timeout="10"
 
-         # sendq: Amount of data that the server is allowed to send to the user
-         # before they are dropped.
-         sendq="262144"
-
-         # recvq: amount of data allowed in a clients queue before they are dropped.
-         recvq="8192"
-
-         # localmax: Maximum local connections per IP.
+         # localmax: Maximum local connections per IP (or CIDR mask, see below).
          localmax="3"
 
-         # globalmax: Maximum global (network-wide) connections per IP.
+         # globalmax: Maximum global (network-wide) connections per IP (or CIDR mask, see below).
          globalmax="3"
 
-         # useident: Defines if users in this class must respond to a ident query or not.
+         # useident: Defines if users in this class MUST respond to a ident query or not.
          useident="no"
 
          # limit: How many users are allowed in this class
@@ -256,6 +256,8 @@
          # modes: Usermodes that are set on users in this block on connect.
          # Enabling this option requires that the m_conn_umodes module be loaded.
          # This entry is highly recommended to use for/with IP Cloaking/masking.
+         # For the example to work, this also requires that the m_cloaking
+         # module be loaded as well.
          modes="+x"
 
          # port: What port this user is allowed to connect on. (optional)
@@ -263,6 +265,10 @@
          port="6667">
 
 <connect
+         # name: Name to use for this connect block. Mainly used for
+         # connect class inheriting.
+         name="main"
+
          # allow: What IP addresses/hosts to allow for this block.
          allow="*"
 
@@ -274,16 +280,22 @@
          # disconnecting a user if they do not do anything on connect.
          # (Note, this is a client-side thing, if the client does not
          # send /nick, /user or /pass)
-         timeout="60"
+         timeout="10"
 
          # pingfreq: How often (in seconds) the server tries to ping connecting clients.
          pingfreq="120"
 
-         # sendq: Amount of data that the server is allowed to send to the user
-         # before they are dropped.
-         sendq="262144"
+         # hardsendq: maximum amount of data allowed in a client's send queue
+         # before they are dropped. Keep this value higher than the length of
+         # your network's /LIST or /WHO output, or you will have lots of
+         # disconnects from sendq overruns!
+         hardsendq="1048576"
 
-         # recvq: amount of data allowed in a clients queue before they are dropped.
+         # softsendq: amount of data in a client's send queue before the server
+         # begins delaying their commands
+         softsendq="8192"
+
+         # recvq: amount of data allowed in a client's queue before they are dropped.
          recvq="8192"
 
          # localmax: Maximum local connections per IP.
@@ -301,6 +313,8 @@
          # modes: Usermodes that are set on users in this block on connect.
          # Enabling this option requires that the m_conn_umodes module be loaded.
          # This entry is highly recommended to use for/with IP Cloaking/masking.
+         # For the example to work, this also requires that the m_cloaking
+         # module be loaded as well.
          modes="+x">
 
 
@@ -310,7 +324,9 @@
 # throttle limits across a CIDR range. (A CIDR range is a group of    #
 # IPs, for example, the CIDR range 192.168.1.0-192.168.1.255 may be   #
 # represented as 192.168.1.0/24). This means that abuse across an ISP #
-# is detected and curtailed much easier.                              #
+# is detected and curtailed much easier. Here is a good chart that    #
+# shows how many IPs the different CIDRs correspond to:               #
+# http://en.wikipedia.org/wiki/CIDR#Prefix_aggregation                #
 #                                                                     #
 
 <cidr
@@ -328,21 +344,22 @@
 
 # This file has all the information about oper classes, types and o:lines.
 # You *MUST* edit it.
-<include file="opers.conf.example">
+<include file="conf/opers.conf.example">
 
 # This file has all the information about server links and ulined servers.
 # You *MUST* edit it if you intend to link servers.
-<include file="links.conf.example">
+<include file="conf/links.conf.example">
 
 #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
 #                                                                     #
 
 <files
-       # motd: Path to your motd file. Path is relative to the conf directory.
-       motd="inspircd.motd.example"
+       # motd: Path to your motd file. Path is relative to the run directory.
+       motd="conf/inspircd.motd.example"
 
-       # rules: Path to your rules file. Path is relative to the conf directory.
-       rules="inspircd.rules.example">
+       # rules: Path to your rules file. Path is relative to the run directory.
+       # This is optional and is displayed when a user does /rules on the network.
+       rules="conf/inspircd.rules.example">
 
 #-#-#-#-#-#-#-#-#-#-#-# MAXIMUM CHANNELS -#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 #                                                                     #
@@ -360,7 +377,13 @@
 
 <dns
      # server: DNS server to use to attempt to resolve IP's to hostnames.
-     server="127.0.0.1"
+     # in most cases, you won't need to change this, as inspircd will
+     # automatically detect the nameserver depending on /etc/resolv.conf
+     # (or, on windows, your set nameservers in the registry.)
+     # Note that this must be an IP address and not a hostname, because
+     # there is no resolver to resolve the name until this is defined!
+     #
+     # server="127.0.0.1"
 
      # timeout: seconds to wait to try to resolve DNS/hostname.
      timeout="5">
@@ -444,6 +467,13 @@
          # should be suffixed with.
          suffixpart="\""
 
+         # fixedquit: Set all users' quit messages to this value.
+         #fixedquit=""
+
+         # fixedpart: Set all users' part messages in all channels
+         # to this value.
+         #fixedpart=""
+
          # syntaxhints: If enabled, if a user fails to send the correct parameters
          # for a command, the ircd will give back some help text of what
          # the correct parameters are.
@@ -459,12 +489,17 @@
          # it will just message the user normally.
          ircumsgprefix="no"
 
-         # announcets: If set to yes, when the TS on a channel changes, all users
+         # announcets: If set to yes, when the TimeStamp on a channel changes, all users
          # in channel will be sent a NOTICE about it.
          announcets="yes"
 
+         # allowmismatched: Setting this option to yes will allow servers to link even
+	 # if they don't have the same VF_OPTCOMMON modules loaded. Setting this to
+	 # yes may introduce some desyncs and weirdness.
+	 allowmismatched="no"
+
          # hostintopic: If enabled, channels will show the host of the topicsetter
-         # in the topic.
+         # in the topic. If set to no, it will only show the nick of the topicsetter.
          hostintopic="yes"
 
          # pingwarning: If a server does not respond to a ping within x seconds,
@@ -487,10 +522,6 @@
          # banned from the server.
          moronbanner="You're banned! Email haha@abuse.com with the ERROR line below for help."
 
-         # exemptchanops: Defines what channel modes channel operators are
-         # exempt from. Supported modes are +TCGfcSFBgN. Defaults to off.
-         exemptchanops=""
-
          # invitebypassmodes: This allows /invite to bypass other channel modes.
          # (Such as +k, +j, +l, etc)
          invitebypassmodes="yes">
@@ -505,8 +536,7 @@
              netbuffersize="10240"
 
              # maxwho: Maximum number of results to show in a /who query.
-             # It is not recommended to set this above 1024.
-             maxwho="128"
+             maxwho="4096"
 
              # somaxconn: The maximum number of connections that may be waiting
              # in the accept queue. This is *NOT* the total maximum number of
@@ -624,6 +654,10 @@
 # defined to account for a null terminator on the end of the text.    #
 #                                                                     #
 # These values should match network-wide otherwise issues will occur. #
+#                                                                     #
+# The highest safe value you can set any of these options to is 500,  #
+# but it is recommended that you keep them somewhat                   #
+# near their defaults (or lower).                                     #
 
 <limits
         # maxnick: Maximum length of a nickname.
@@ -801,7 +835,7 @@
 # provide almost all the features of InspIRCd. :)                     #
 #                                                                     #
 # The default does nothing -- we include it for simplicity for you.   #
-<include file="modules.conf.example">
+<include file="conf/modules.conf.example">
 
 
 #########################################################################