Don't remove an expired xline on add, simply drop duplicates (1.1 behaviour). This...

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

diff --git a/conf/inspircd.conf.example b/conf/inspircd.conf.example
index 743306d63b4e42ccfedbd9513971327dfb3d7bf8..ca218c4a1b44bc8a15222255e55a7eb203d65e2b 100644 (file)
--- a/conf/inspircd.conf.example
+++ b/conf/inspircd.conf.example
@@ -178,6 +178,17 @@
 #   You may have as many of these as you require. To allow/deny all   #
 #   connections, use a '*' or 0.0.0.0/0.                              #
 #                                                                     #
+#  -- It is important to note that connect tags are read from the  -- #
+#     TOP DOWN. This means that you should have more specific deny    #
+#    and allow tags at the top, progressively more general, followed  #
+#        by a <connect allow="*" (should you wish to have one).       #
+#                                                                     #
+#                                                                     #
+<connect 
+         # deny: Will not let people connect if they have specified host/IP.
+         deny="69.254.*">
+
+<connect deny="3ffe::0/32">
 
 <connect 
          # allow: What IP addresses/hosts to allow for this block.
@@ -228,11 +239,6 @@
          # This entry is highly recommended to use for/with IP Cloaking/masking.
          modes="+x">
 
-<connect 
-         # deny: Will not let people connect if they have specified host/IP.
-         deny="69.254.*">
-
-<connect deny="3ffe::0/32">
 
 #-#-#-#-#-#-#-#-#-#-#-#-  CIDR CONFIGURATION   -#-#-#-#-#-#-#-#-#-#-#-
 #                                                                     #
@@ -539,6 +545,12 @@
           # banned on.
           restrictbannedusers="yes"
 
+          # genericoper: Setting this value makes all opers on this server
+          # appear as 'is an IRC operator' in their WHOIS, regardless of their
+          # oper type, however oper types are still used internally. This only
+          # affects the display in WHOIS.
+          genericoper="no"
+
           # userstats: /stats commands that users can run (opers can run all).
           userstats="Pu">