Automated merge with ssh://shadowircd/uranium/shadowircd/

[irc/rqf/shadowircd.git] / doc / reference.conf

diff --git a/doc/reference.conf b/doc/reference.conf
index b53c46fa463bc7c831298659f307c1f8cfa37b54..e019e39d0586cc6a80cf2752836bde256ef0c274 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -326,15 +326,15 @@ auth {
         spoof = "I.still.hate.packets";
 
        /* autojoin: Channel (or channels, comma-seperated) to join users
-     * in this auth block to on connect. Note that this won't join
-     * the user through any bans or otherwise restrictive chmodes.
-     */
-    autojoin = "#shadowircd,#test";
+        * in this auth block to on connect. Note that this won't join
+        * the user through any bans or otherwise restrictive chmodes.
+        */
+       autojoin = "#shadowircd,#test";
 
        /* autojoin_opers : Channel (or channels, comma-seperated) to join
-     * opers to on oper-up.
-     */
-    autojoin_opers = "#opers,#help";
+        * opers to on oper-up.
+        */
+       autojoin_opers = "#opers,#help";
 
        /* Possible flags in auth:
         * 
@@ -673,6 +673,25 @@ exempt {
 
 /* The channel block contains options pertaining to channels */
 channel {
+       /* autochanmodes: Modes that will be set on a unregistered channel
+        * when the first user joins it.
+        */
+       autochanmodes = "nt";
+
+       /* halfop: Enable/disable channel mode +h, which adds halfop,
+        * a channel status below op that has op powers (kick, ban, mode, etc.)
+        * halfops can only kick/devoice/etc people who are +v or
+        * do not have any channel status.
+        */
+       use_halfop = yes;
+
+       /* owner: Enable/disable channel mode +a, which adds owner,
+        * a channel status above op that has op powers (kick, ban, mode, etc.)
+        * owners can only be kicked/deownered by other owners, and may kick
+        * or deop ops and halfops.
+        */
+       use_owner = yes;
+
        /* invex: Enable/disable channel mode +I, a n!u@h list of masks
         * that can join a +i channel without an invite.
         */
@@ -779,6 +798,11 @@ channel {
         * when a RESV is issued.
         */
        resv_forcepart = yes;
+
+       /* kick_no_rejoin_time: the amount of time that a user cannot
+        * rejoin for after being kicked out of a +J channel.
+        */
+       kick_no_rejoin_time = 30 seconds;
 };
 
 
@@ -868,6 +892,14 @@ alias "MemoServ" {
        target = "MemoServ";
 };
 
+alias "HostServ" {
+       target = "HostServ";
+};
+
+alias "BotServ" {
+       target = "BotServ";
+};
+
 alias "NS" {
        target = "NickServ";
 };
@@ -884,6 +916,14 @@ alias "MS" {
        target = "MemoServ";
 };
 
+alias "HS" {
+       target = "HostServ";
+};
+
+alias "BS" {
+       target = "BotServ";
+};
+
 /* The general block contains many of the options that were once compiled
  * in options in config.h.  The general block is read at start time.
  */
@@ -910,10 +950,10 @@ general {
 
        /* default umodes: umodes to set upon connection
         * If you have enabled the ip_cloaking extension, and you wish for
-        * incoming clients to be set +x upon connection, add +x to the umode
-        * string below.
+        * incoming clients to be cloaked upon connection, +x must be in
+        * the umode string below.
         */
-       default_umodes = "+i";
+       default_umodes = "+ix";
 
        /* default operstring: defines the default oper response
         * in /whois queries, eg "is an IRC Operator".
@@ -1175,6 +1215,9 @@ general {
         * +s - servnotice - See server notices
         * +w - wallop     - See oper and server generated WALLOPS
         * +z - operwall   - See operwalls
+        * +C - noctcp     - Block CTCPs to user.
+        * +V - noinvite   - Block INVITE to user.
+        * +B - bot        - Marks as a bot.
         */
         
        /* oper only umodes: usermodes only opers may set */