Stop using chm_nosuch as a sentinel value (#53)

[solanum.git] / doc / reference.conf

diff --git a/doc/reference.conf b/doc/reference.conf
index 281aa3ea16bee564e03ed72c99de6994bf5a9987..1d2fdc947e116ba7d8af963694995ae917215c8a 100644 (file)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -47,9 +47,6 @@
  * Channel mode +-T (blocks notices)                 -- chm_nonotice
  * Channel mode +-O (oper only)                      -- chm_operonly
  * Channel mode +-S (ssl only)                       -- chm_sslonly
- * Emulates channel mode +-O (oper only) (+-iI $o)   -- chm_operonly_compat
- * Emulates channel mode +-R (quiet unreg) (+-q $~a) -- chm_quietunreg_compat
- * Emulates channel mode +-S (ssl only) (+-b $~z)    -- chm_sslonly_compat
  * Channel mode +-M (disallow KICK on IRC ops)       -- chm_operpeace
  * Restrict channel creation to logged in users      -- createauthonly
  * Account bans (+b $a[:mask])                       -- extb_account
@@ -84,9 +81,6 @@
 #loadmodule "extensions/chm_nonotice";
 #loadmodule "extensions/chm_operonly";
 #loadmodule "extensions/chm_sslonly";
-#loadmodule "extensions/chm_operonly_compat";
-#loadmodule "extensions/chm_quietunreg_compat";
-#loadmodule "extensions/chm_sslonly_compat";
 #loadmodule "extensions/chm_operpeace";
 #loadmodule "extensions/createauthonly";
 #loadmodule "extensions/extb_account";
@@ -631,12 +625,7 @@ connect "ssl.uplink.com" {
        flags = ssl, topicburst;
 };
 
-/* cluster {}; servers that we propagate things to automatically.
- * NOTE: This does NOT grant them privileges to apply anything locally,
- *       you must add a seperate shared block for that.  Clustering will
- *       only be done for actions by LOCAL opers, that arent directed
- *       remotely.
- */
+/* cluster {}; servers that we propagate things to automatically. */
 cluster {
        /* name: the server to share with, this can be a wildcard and may be
         * stacked.
@@ -669,8 +658,7 @@ cluster {
 
 /* service{}: privileged servers (services). These servers have extra
  * privileges such as setting login names on users and introducing clients
- * with umode +S (unkickable, hide channels, etc). This does not allow them
- * to set bans, you need a separate shared{} for that.
+ * with umode +S (unkickable, hide channels, etc).
  * Do not place normal servers here.
  * There may be only one service{} block.
  */
@@ -679,59 +667,6 @@ service {
        name = "services.int";
 };
 
-/* shared {}: users that are allowed to place remote bans on our server.
- * NOTE: These are ordered top down.  The first one the user@host and server
- *       matches will be used.  Their access will then be decided on that
- *       block and will not fall back to another block that matches.
- */
-shared {
-       /* oper: the user@host and server the user must be on to set klines.
-        * The first field must be a user@host, the second field is an
-        * optional server.  These may be stacked.
-        */
-       /* flags: list of what to allow them to place, all the oper lines
-        * above this (up until another flags entry) will receive these
-        * flags.  This *must* be present.
-        *
-        *    kline   - allow setting perm/temp klines
-        *    tkline  - allow setting temp klines
-        *    unkline - allow removing klines
-        *    xline   - allow setting perm/temp xlines
-        *    txline  - allow setting temp xlines
-        *    unxline - allow removing xlines
-        *    resv    - allow setting perm/temp resvs
-        *    tresv   - allow setting temp resvs
-        *    unresv  - allow removing xlines
-        *    all     - allow oper/server to do all of above.
-        *    locops  - allow locops - only used for servers who cluster
-        *    rehash  - allow rehashing
-        *    dline   - allow setting perm/temp dlines
-        *    tdline  - allow setting temp dlines
-        *    undline - allow removing dlines
-        *    grant   - allow granting operator status
-        *    die     - allow remote DIE/RESTART
-        *    module  - allow remote module commands
-        *    none    - disallow everything
-        */
-
-       /* allow flame@*.leeh.co.uk on server irc.ircd-ratbox.org and
-        * allow leeh@*.leeh.co.uk on server ircd.ircd-ratbox.org to kline
-        */
-       oper = "flame@*.leeh.co.uk", "irc.ircd-ratbox.org";
-       oper = "leeh@*.leeh.co.uk", "ircd.ircd-ratbox.org";
-       flags = kline;
-
-       /* you may forbid certain opers/servers from doing anything */
-       oper = "irc@vanity.oper", "*";
-       oper = "*@*", "irc.vanity.server";
-       oper = "irc@another.vanity.oper", "bigger.vanity.server";
-       flags = none;
-
-       /* or allow everyone to place temp klines */
-       oper = "*@*";
-       flags = tkline;
-};
-
 /* exempt {}: IPs that are exempt from Dlines and rejectcache. (OLD d:) */
 exempt {
        ip = "192.0.2.0/24";
@@ -740,6 +675,12 @@ exempt {
        ip = "127.0.0.1";
 };
 
+/* secure {}: IPs that are considered to be secure networks, and get
+ * +Z without using TLS */
+secure {
+       ip = "127.0.0.1";
+};
+
 /* The channel block contains options pertaining to channels */
 channel {
        /* invex: Enable/disable channel mode +I, a n!u@h list of masks
@@ -1465,6 +1406,9 @@ general {
 
        /* tls_ciphers_oper_only: show the TLS cipher string in /WHOIS only to opers and self */
        tls_ciphers_oper_only = no;
+
+       /* hidden_caps: client capabilities we'll pretend we don't support until they're requested */
+       #hidden_caps = "userhost-in-names";
 };
 
 modules {