Remove duplicated settings now solely defined by the <connect> class

2 files changed, 15 insertions, 17 deletions

diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example
index 9d011ccdf..b120f7a70 100644
--- a/docs/inspircd.conf.example
+++ b/docs/inspircd.conf.example
@@ -378,6 +378,12 @@
 	# module be loaded as well.
 	modes="+x">
 
+# Connect classes can also be assigned upon /OPER, or by modules like m_sqlauth.
+# Classes with only a name (no allow=/deny=) are allowed for this use; they never match new users.
+<connect name="OperOnlyClass"
+	# some higher limits for opers
+	commandrate="50000" maxchans="100" hardsendq="10485760">
+
 
 #-#-#-#-#-#-#-#-#-#-#-#-  CIDR CONFIGURATION   -#-#-#-#-#-#-#-#-#-#-#-
 #                                                                     #
@@ -425,16 +431,6 @@
 # not when the command is run.
 #<execfiles rules="wget -O - http://www.example.com/rules.txt">
 
-#-#-#-#-#-#-#-#-#-#-#-# MAXIMUM CHANNELS -#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-#                                                                     #
-
-<channels
-          # users: Maximum number of channels a user can be in at once.
-          users="20"
-
-          # opers: Maximum number of channels a oper can be in at once.
-          opers="60">
-
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-# DNS SERVER -#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # If these values are not defined, InspIRCd uses the default DNS resolver
 # of your system.
diff --git a/docs/opers.conf.example b/docs/opers.conf.example
index d76496e66..50e742c77 100644
--- a/docs/opers.conf.example
+++ b/docs/opers.conf.example
@@ -24,14 +24,13 @@
      #   - servers/auspex: allows opers with this priv to see more detail about server information than normal users.
      # ACTIONS:
      #   - users/mass-message: allows opers with this priv to PRIVMSG and NOTICE to a server mask (e.g. NOTICE $*)
-     #   - channels/high-join-limit: allows opers with this priv to join <channels:opers> total channels instead of <channels:users> total channels.
-     #   - channels/set-permanent: allows opers with this priv to set +P on channels with m_permchannels.
-     # PERMISSIONS:
-     #   - users/flood/no-throttle: allows opers with this priv to send commands without being throttled (*NOTE)
-     #   - users/flood/increased-buffers: allows opers with this priv to send and recieve data without worrying about being disconnected for exceeding limits (*NOTE)
+     # OVERRIDE:
+     #   - override/<permname>: allows permisison to be overridden via m_override
      #
-     # *NOTE: These privs are potantially dangerous, as they grant users with them the ability to hammer your server's CPU/RAM as much as they want, essentially.
-     privs="users/auspex channels/auspex servers/auspex users/mass-message channels/high-join-limit channels/set-permanent users/flood/no-throttle users/flood/increased-buffers"
+	 # NOTE: many of the settings (channels/high-join-limit, users/flood/*) have changed to
+	 # numerical settings in the <connect> class to allow them to be assigned to users.
+     #
+     privs="users/auspex channels/auspex servers/auspex users/mass-message channels/high-join-limit"
 
      # usermodes: Oper-only usermodes that opers with this class can use.
      usermodes="*"
@@ -61,6 +60,9 @@
     # classes: classes (above blocks) that this type belongs to.
     classes="OperChat BanControl HostCloak Shutdown ServerLink"
 
+	# class: A named <connect> class for this oper; use to raise general user limits
+	class="OperOnlyClass"
+
     # vhost: host oper gets on oper-up. This is optional.
     vhost="netadmin.omega.org.za"