[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed

[Toni G. <zo...@us...>]

CVSROOT    : /cvsroot/irc-dev
Module     : ircd-ircdev
Commit time: 2004-12-27 11:25:40 UTC

Modified files:
     doc/ircd.sample-en.conf doc/ircd.sample-es.conf

Log message:

Actualizacion ircd.conf

---------------------- diff included ----------------------
Index: ircd-ircdev/doc/ircd.sample-en.conf
diff -u ircd-ircdev/doc/ircd.sample-en.conf:1.8 ircd-ircdev/doc/ircd.sample-en.conf:1.9
--- ircd-ircdev/doc/ircd.sample-en.conf:1.8	Wed Nov 17 03:45:49 2004
+++ ircd-ircdev/doc/ircd.sample-en.conf	Mon Dec 27 03:25:29 2004
@@ -1,6 +1,6 @@
 # ircd.conf - configuration file for IRC-Dev's IRCD.
 #
-# Last Updated:  17, Nov 2004.
+# Last Updated:  27, Dec 2004.
 #
 # Written by Niels <ni...@un...>, based on the original example.conf,
 # server code and some real-life (ahem) experience.
@@ -54,17 +54,20 @@
 # General {
 #         name = "servername";
 #         vhost = "virtualhost";
+#         resolver = "ipaddress";
 #         description = "description";
 #         numeric = numericnumber;
 # };
 #
-# The "vhost" field must contain either a * or a valid IPv4 address in
-# dotted quad notation. (127.0.0.1) The address MUST be the address
-# of a physical interface on the host. This address is used for outgoing
-# connections only, see "Port" block for listener virtual hosting.
-# If in doubt put a * or the IP of your primary interface here.
-# The server must be compiled with virtual hosting turned on to get this
-# to work correctly.
+# If present, "virtual"  must contain a valid address in dotted
+# quad or IPv6 numeric notation (127.0.0.1 or ::1). The address MUST
+# be the address of a physical interface on the host. This address is
+# used for outgoing connections if the "Connect" block does not override
+# it. See "Port" block for listener virtual hosting. If in doubt,
+# leave it out.
+#
+# You may need to specify the "resolver" address if your compile
+# defaults to using IPv6 but your resolvers are all IPv4 hosts.
 #
 # Note that "numeric" field has to be unique on the network your server
 # is running on, must be between 0 and 4095, and is not updated on a rehash.
@@ -102,20 +105,14 @@
 #  usermode = "+i";
 # };
 #
+# The "maxlinks" field should be set at either 0 or 1.
+#
 # The "connectfreq" field applies only to servers, and specifies the
 # frequency that the server tries to autoconnect. setting this to 0 will
 # cause the server to attempt to connect repeatedly with no delay until the 
 # "maxlinks" condition is satisfied. This is a Bad Thing(tm).
 # Note that times can be specified as a number, or by giving something
 # like: 1 minutes 20 seconds, or 1*60+20.
-# Client {
-#  host = "user@host";
-#  ip = "ip@host";
-#  password = "password";
-#  class = "classname";
-# };
-#
-# The "maxlinks" field should be set at either 0 or 1.
 #
 # Recommended server classes:
 # All your server uplinks you are not a hub for.
@@ -135,6 +132,23 @@
  sendq = 9000000;
 };
 
+# Client {
+#  username = "ident";
+#  host = "host";
+#  ip = "127.0.0.0/8";
+#  password = "password";
+#  class = "classname";
+#  maxlinks = 3;
+# };
+#
+# Everything in a "Client" block is optional.  If a "username" mask is
+# given, it must match the client's username from the IDENT protocol.
+# If a "host" mask is given, the client's hostname must resolve and
+# match the host mask.  If a CIDR-style "IP" mask is given, the client
+# must have an IP matching that range.  If "maxlinks" is given, it is
+# limits the number of matching clients allowed from a particular IP
+# address.
+#
 # Recommended client classes:
 # Client classes. 10 = locals; 2 = for all .net and .com that are not
 # in Europe; 1 = for everybody.
@@ -148,7 +162,7 @@
 Client
 {
  class = "Other";
- host = "*@*";
+ username = "*";
 };
 Class {
  name = "Telefonica";
@@ -313,7 +327,7 @@
  class = "Local";
 };
 
-# You can put a digit (0..9) in the password value, which will make ircd
+# You can put an expression in the maxlinks, which will make ircd
 # only accept a client when the total number of connections to the network
 # from the same IP number doesn't exceed this number.
 # The following example would accept at most one connection per IP number
@@ -321,12 +335,12 @@
 # that have "dial??.*" as host mask:
 # Client {
 #  host = "*@*.ono.com";
-#  password = "1";
+#  maxlinks = "1";
 #  class = "Other";
 # };
 # Client {
 #  host = "*@dial??.*";
-#  password = "2";
+#  maxlinks = "2";
 #  class = "Other";
 # };
 #
@@ -372,7 +386,7 @@
  file = "irc-dev.motd";
 };
 
-# [Server]
+# [Uworld]
 #
 # One of the many nice features of IRC-Dev is "Uworld", a program
 # connected to the net as a server. This allows it to broadcast any mode
@@ -381,16 +395,9 @@
 # There is only one slight problem: the TimeStamp protocol prevents this.
 # So there is a configuration option to allow them anyway from a certain
 # server.
-# Server {
+# UWorld {
 #  # The servername or wildcard mask for it that this applies to.
 #  name = "relservername";
-#  # The mask of servers they are allowed to introduce(for hub=yes;) or
-#  # not allowed to introduce(for leaf=yes).
-#  mask = "servermask";
-#  # No is assumed for these unless you set it to yes.
-#  uworld = no;
-#  leaf = no;
-#  hub = yes;
 # };
 #
 # Note: (1) These lines are agreed on by every server admin on IRC-Dev;
@@ -400,7 +407,7 @@
 # If you're on IRC-Dev, you MUST have these lines. I cannnot stress
 # this enough.  If all of the servers don't have the same lines, the
 # servers will try to undo the mode hacks that Uworld does.  Make SURE that
-# all of the servers have the EXACT same Ulines.
+# all of the servers have the EXACT same Uworld blocks.
 #
 # If your server starts on a bit larger network, you'll probably get
 # assigned one or two uplinks to which your server can connect.
@@ -410,28 +417,11 @@
 # You can also force a server(even one that doesn't connect to you)
 # to be a leaf with "leaf = yes;"
 
-Server {
+UWorld {
  name = "luz.irc-dev.net";
- mask = "*";
- uworld = yes;
- hub = yes;
 };
-Server {
+Uworld {
  name = "services.irc-dev.net";
- mask = "*";
- uworld = yes;
- hub = yes;
-};
-Server {
- name = "gmsis2.irc-dev.net";
- mask = "*";
- hub = yes;
-};
-# An example just to make sure IRCnet doesn't get on IRC-Dev.Net...
-Server {
- name = "*";
- mask = "eris.berkeley.edu";
- hub = yes;
 };
 
 # It is possible to Jupe nicks.
@@ -519,6 +509,8 @@
 #  password = "passwd";
 #  port = portno;
 #  class = "classname";
+#  maxhops = 2;
+#  hub = "*.eu.irc-dev.net";
 # };
 #
 # The "port" field defines the default port the server tries to connect
@@ -526,6 +518,12 @@
 # the port used when the server attempts to auto-connect to the remote 
 # server. (See "Class" blocks for more informationa about auto-connects).
 #
+# The "maxhops" field causes an SQUIT if a hub tries to introduce
+# servers farther away than that; the element "leaf," is an alias for
+# "maxhops = 0,".  The "hub" field limits the names of servers that may
+# be introduced by a hub; the element "hub;" is an alias for
+# "hub = "*";".
+#
 # Our primary uplink.
 Connect {
  name = "devel.irc-dev.net";
@@ -533,6 +531,7 @@
  password = "passwd";
  port = 4400;
  class = "Server";
+ hub;
 };
 
 
@@ -704,6 +703,15 @@
  nick = "X...@ch...";
 };
 
+# You can ask a separate server whether to allow users to connect.
+IAuth {
+ pass = "ircd-iauth";
+ host = "127.0.0.1";
+ port = 7700;
+ connectfreq = 30;
+ timeout = 60;
+};
+
 # [Features]
 # IRC servers have a large number of options and features.  Most of these
 # are set at compile time through the use of #define's--see "make config"
@@ -755,10 +763,9 @@
 #  "MAXBANS" = "45";
 #  "MAXSILES" = "15";
 #  "MAXWATCHS" = "128";
-#  "HANGONGOODLINK = "300";
+#  "HANGONGOODLINK" = "300";
 #  "HANGONRETRYDELAY" = "10";
 #  "CONNECTTIMEOUT" = "90";
-#  "TIMESEC" = "60";
 #  "MAXIMUM_LINKS" = "1";
 #  "PINGFREQUENCY" = "120";
 #  "CONNECTFREQUENCY" = "600";
@@ -772,20 +779,16 @@
 #  "MPATH" = "ircd.motd";
 #  "RPATH" = "remote.motd";
 #  "PPATH" = "ircd.pid";
-#  "VIRTUAL_HOST" = "FALSE";
 #  "TOS_SERVER" = "0x08";
 #  "TOS_CLIENT" = "0x08";
 #  "POLLS_PER_LOOP" = "200";
-#  "IRCD_RES_TIMEOUTS = "4";
 #  "IRCD_RES_RETRIES = "2";
+#  "IRCD_RES_TIMEOUT = "4";
 #  "AUTH_TIMEOUT = "9";
 #  "ANNOUNCE_INVITES = "FALSE";
-#  "CRYPT_OPER_PASSWORD" = "TRUE";
 #  "CONFIG_OPERCMDS" = "FALSE";
-#  "LIST_CHAN" = "TRUE";
 #  "HIS_SNOTICES" = "TRUE";
 #  "HIS_SNOTICES_OPER_ONLY" = "TRUE";
-#  "HIS_DESYNCS" = "TRUE";
 #  "HIS_DEBUG_OPER_ONLY" = "TRUE";
 #  "HIS_WALLOPS" = "TRUE";
 #  "HIS_MAP" = "TRUE";
@@ -803,6 +806,7 @@
 #  "HIS_STATS_j" = "TRUE";
 #  "HIS_STATS_k" = "TRUE";
 #  "HIS_STATS_l" = "TRUE";
+#  "HIS_STATS_L" = "TRUE";
 #  "HIS_STATS_m" = "TRUE";
 #  "HIS_STATS_M" = "TRUE";
 #  "HIS_STATS_o" = "TRUE";
Index: ircd-ircdev/doc/ircd.sample-es.conf
diff -u ircd-ircdev/doc/ircd.sample-es.conf:1.3 ircd-ircdev/doc/ircd.sample-es.conf:1.4
--- ircd-ircdev/doc/ircd.sample-es.conf:1.3	Wed Nov 17 03:45:49 2004
+++ ircd-ircdev/doc/ircd.sample-es.conf	Mon Dec 27 03:25:29 2004
@@ -1,6 +1,6 @@
 # ircd.conf - archivo de configuración para el IRCD de IRC-Dev.
 #
-# Ultima actualización:  17, Nov 2004.
+# Ultima actualización:  27, Dec 2004.
 #
 # Escrito por Niels <ni...@un...>, basado en el archivo example.conf
 # original, en el código del servidor y la experiencia de la vida real.
@@ -60,18 +60,20 @@
 # General {
 #         name = "nombreservidor";
 #         vhost = "virtualhost";
+#         resolver = "direccionip";
 #         description = "descripcion";
 #         numeric = númerodenúmerico;
 # };
 #
-# El campo "vhost" debe contener un * o una dirección IPv4 válida en la
-# notación de 4 números (127.0.0.1). La dirección DEBE ser la dirección
-# de una interfaz física en el host. Esta dirección se utiliza solamente
-# para las conexiones salientes, veáse el bloque "Port" para la escucha
-# con virtual hosting. 
-# En caso de duda, pon un * o la IP de tu interface primaria aquí.
-# El servidor debe estar compilado con "virtual hosting" activado para
-# conseguir que esto trabaje correctamente.
+# Si esta presente, el campo "vhost" debe contener una dirección válida
+# en la notación de 4 números o notación numérica de IPv6 (127.0.0.1 o ::1).
+# La dirección DEBE ser la dirección de una interfaz física en el host.
+# Esta dirección se utiliza para las conexiones salientes si el bloque
+# "Connect" no la elimina. Veáse el bloque "Port" para la escucha con
+# virtual hosting. En caso de duda no pongas nada.
+#
+# Puede que necesites especificar la dirección del resolvedor DNS si tu
+# has compilado con IPv6 pero tus resolvedores son hosts de IPv4.
 #
 # Observe que el campo "numeric" tiene que ser único en la red si tu
 # servidor esta funcionando, y debe estar entre 0 y 4095, y no se
@@ -112,6 +114,8 @@
 #  usermode = "+i";
 # };
 #
+# El campo "maxlinks" se debe fijar en 0 o 1.
+#
 # El campo "connectfreq" se aplica solamente a los servidores, y especifica
 # la frecuencia con la cual el servidor intentará hacer el "autoconnect".
 # Ajustando a 0 causará que el servidor intentará repetidamente sin pausa
@@ -119,14 +123,6 @@
 # Esto es una mala idea (Bad Thing(tm)).
 # Observe que los tiempos se pueden especificar como número, dando algo
 # como este: 1 minutes 20 seconds, or 1*60+20.
-# Client {
-#  host = "user@host";
-#  ip = "ip@host";
-#  password = "contraseña";
-#  class = "nombreclase";
-# };
-#
-# El campo "maxlinks" se debe fijar en 0 o 1.
 #
 # Clases de servidores recomendadas:
 # Todos los uplinks del servidor si tu no eres un "hub".
@@ -146,6 +142,22 @@
  sendq = 9000000;
 };
 
+# Client {
+#  username = "ident";
+#  host = "host";
+#  ip = "127.0.0.0/8";
+#  password = "contraseña";
+#  class = "nombreclase";
+#  maxlinks = 3;
+# };
+#
+# Todo en un bloque "Client" es opcional. Si se da una máscara de "username",
+# eso será comparado con el "username" del cliente del protocolo IDENT.
+# Si se da una máscara de "host", el hostname del cliente debe ser resuelto y
+# comparado con la máscara. Si se da una máscara de "IP" en CIDR, el cliente
+# debe tener una IP dentro de ese rango. Si se da el campo "maxlinks", este
+# es el límite de clientes permitidos desde una dirección IP particular.
+#
 # Clases de clientes recomendadas:
 # Clases de clientes. 10 = locales; 2 = para todos los .net y .com que no
 # estén en Europa; 1 = para todos los demás.
@@ -159,7 +171,7 @@
 Client
 {
  class = "Otros";
- host = "*@*";
+ username = "*";
 };
 Class {
  name = "Telefonica";
@@ -329,7 +341,8 @@
  class = "Local";
 };
 
-# Puedes poner un número (0..9) en el campo "password", que hará que el
+
+# Puedes poner una expresión en el campo "maxlinks", que hará que el
 # ircd sólo acepte un cliente cuando el numero total de conexiones a la 
 # red desde la misma IP numérica no exceda de ese número.
 # El siguiente ejemplo aceptaría al menos una conexión por IP numérica
@@ -337,12 +350,12 @@
 # internet por modem que tengan "*.dial??.*" como máscara de host:
 # Client {
 #  host = "*@*.ono.com";
-#  password = "1";
+#  maxlinks = "1";
 #  class = "Otros";
 # };
 # Client {
 #  host = "*@dial??.*";
-#  password = "2";
+#  maxlinks = "2";
 #  class = "Otros";
 # };
 #
@@ -389,7 +402,7 @@
  file := "irc-dev.motd";
 };
 
-# [Server]
+# [Uworld]
 #
 # Una de las características más atractivas de IRC-Dev, es "Uworld", un
 # programa conectado a la red como servidor. Esto le permite realizar
@@ -398,16 +411,9 @@
 # Sólo hay un pequeño problema: El protocolo del TimeStamp (TS) hace
 # que no sea posible. Por esto, hay una opción de configuración para 
 # permitir esos cambios desde cierto servidor.
-# Server {
+# Uworld {
 #  # El nombre del servidor o la máscara para el que esto se aplica.
 #  name = "relnombreservidor";
-#  # La máscara de servidores se permite para introducir (para hub = yes;)
-#  # o no se permite (para leaf = yes;).
-#  mask = "máscaraservidor";
-#  # No son asumidos estos valores a menos que lo fijes a "yes".
-#  uworld = no;
-#  leaf = no;
-#  hub = yes;
 # };
 #
 # Nota: (1) Estas líneas son puestas por cada administrador de un servidor
@@ -418,8 +424,8 @@
 # Si estás en IRC-Dev, DEBES tener estas líneas. No puedo tener estrés
 # por esto. Si todos los servidores no tienen las mismas lineas, los
 # servidores intentarán deshacer los "hack" de cambios de modos que hará
-# Uworld. ASEGURATE que todos los servidores tengan EXACTAMENTE las mismas
-# "Ulines". 
+# Uworld. ASEGURATE que todos los servidores tengan EXACTAMENTE los mismos
+# bloques "Uworld". 
 #
 # Si tu servidor arranca en una red más grande, es probable que se te
 # asignen uno o dos servidores a los que tu servidor pueda conectar.
@@ -430,28 +436,11 @@
 # Puedes tambien forzar un servidor (uno que que no conecte con usted)
 # a ser un "leaf" con "leaf = yes;"
 
-Server {
+Uworld {
  name = "luz.irc-dev.net";
- mask = "*";
- uworld = yes;
- hub = yes;
 };
-Server {
+Uworld {
  name = "services.irc-dev.net";
- mask = "*";
- uworld = yes;
- hub = yes;
-};
-Server {
- name = "gmsis2.irc-dev.net";
- mask = "*";
- hub = yes;
-};
-# Un ejemplo para estar seguro que IRCnet no consiga en IRC-Dev.Net...
-Server {
- name = "*";
- mask = "eris.berkeley.edu";
- hub = yes;
 };
 
 # Esto es posible para prohibir (Jupe) nicks.
@@ -545,6 +534,8 @@
 #  password = "contraseña";
 #  port = númeropuerto;
 #  class = "nombreclase";
+#  maxhops = 2;
+#  hub = "*.eu.irc-dev.net";
 # };
 #
 # El campo "port" define el puerto por defecto que el servidor intentará
@@ -553,6 +544,11 @@
 # de autoconectar con el servidor remoto. (Véase los bloques "Class" para
 # más informacion sobre "auto-connects").
 #
+# El campo "maxhops" causa un SQUIT si un hub intenta introducir servidores
+# más lejos que eso, el elemento "leaf"; es un alias para "maxhops = 0;".
+# El campo "hub" limita los nombres de los servidores que pueden introducir
+# por un hub, el elemento "hub;" es un alias para "hub = "*";".
+#
 # Nuestro uplink primario.
 Connect {
  name = "devel.irc-dev.net";
@@ -560,6 +556,7 @@
  password = "passwd";
  port = 4400;
  class = "Servidor";
+ hub;
 };
 
 
@@ -739,6 +736,15 @@
  nick = "X...@ch...";
 };
 
+# Puedes pedir un servidor separado para permitir a los usuarios conectar.
+IAuth {
+ pass = "ircd-iauth";
+ host = "127.0.0.1";
+ port = 7700;
+ connectfreq = 30;
+ timeout = 60;
+};
+
 # [Features]
 # Los servidores de IRC tienen una gran cantidad de opciones y
 # características. La mayoria de éstos se ajustan en tiempo de compilación
@@ -753,8 +759,8 @@
 # características se enumeran abajo, y al final cómo ajustar el "logging".
 #
 # Gracias especiales a Kev por escribir la documentación de F:lines. Eso
-# puede ser encontrado en doc/*/features.txt y la documentación de registro
-# de eventos (logging) se puede encontrar en doc/*/log.txt. Los valores por
+# puede ser encontrado en doc/es/features.txt y la documentación de registro
+# de eventos (logging) se puede encontrar en doc/es/log.txt. Los valores por
 # defecto usados por la red de IRC-Dev están abajo.
 #
 Features
@@ -792,10 +798,9 @@
 #  "MAXBANS" = "45";
 #  "MAXSILES" = "15";
 #  "MAXWATCHS" = "128";
-#  "HANGONGOODLINK = "300";
+#  "HANGONGOODLINK" = "300";
 #  "HANGONRETRYDELAY" = "10";
 #  "CONNECTTIMEOUT" = "90";
-#  "TIMESEC" = "60";
 #  "MAXIMUM_LINKS" = "1";
 #  "PINGFREQUENCY" = "120";
 #  "CONNECTFREQUENCY" = "600";
@@ -808,18 +813,15 @@
 #  "IPCHECK_CLONE_DELAY = "600";
 #  "MPATH" = "ircd.motd";
 #  "RPATH" = "remote.motd";
-#  "PPATH" = "ircd.pid";#  "LIST_CHAN" = "TRUE";
-#  "VIRTUAL_HOST" = "FALSE";
+#  "PPATH" = "ircd.pid";
 #  "TOS_SERVER" = "0x08";
 #  "TOS_CLIENT" = "0x08";
 #  "POLLS_PER_LOOP" = "200";
-#  "IRCD_RES_TIMEOUTS = "4";
 #  "IRCD_RES_RETRIES = "2";
+#  "IRCD_RES_TIMEOUT = "4";
 #  "AUTH_TIMEOUT = "9";
 #  "ANNOUNCE_INVITES = "FALSE";
-#  "CRYPT_OPER_PASSWORD" = "TRUE";
 #  "CONFIG_OPERCMDS" = "FALSE";
-#  "LIST_CHAN" = "TRUE";
 #  "HIS_SNOTICES" = "TRUE";
 #  "HIS_SNOTICES_OPER_ONLY" = "TRUE";
 #  "HIS_DESYNCS" = "TRUE";
@@ -840,6 +842,7 @@
 #  "HIS_STATS_j" = "TRUE";
 #  "HIS_STATS_k" = "TRUE";
 #  "HIS_STATS_l" = "TRUE";
+#  "HIS_STATS_L" = "TRUE";
 #  "HIS_STATS_m" = "TRUE";
 #  "HIS_STATS_M" = "TRUE";
 #  "HIS_STATS_o" = "TRUE";
----------------------- End of diff -----------------------