Rewrote how commands are handled within Anope.

This allows naming commands and having spaces within command names.

1 files changed, 548 insertions, 1320 deletions

diff --git a/data/example.conf b/data/example.conf
index 8e5e49c92..754cfe598 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -157,12 +157,6 @@ serverinfo
 	#id = "00A"
 
 	/*
-	 * These identify the ident@hostname which will be used by the Services pesudoclients.
-	 */
-	ident = "services"
-	hostname = "localhost.net"
-
-	/*
 	 * The filename containing the Services process ID. The path is relative to the
 	 * services executable. If not given, defaults to "services.pid".
 	 */
@@ -469,598 +463,167 @@ options
 }
 
 /*
- * [RECOMMENDED] Logging Configuration 
+ * [RECOMMENDED] Service client configuration
  *
- * This section is used for configuring what is logged and where it is logged to.
- * You may have multiple log blocks if you wish. Remember to properly secure any
- * channels you choose to have Anope log to!
+ * Defines some of the core services. Commands are later added to these services.
  */
-log
-{
-	/*
-	 * Target(s) to log to, which may be one of the following:
-	 *   - a channel name
-	 *   - a filename
-	 *   - globops
-	 */
-	target = "services.log"
-	/* Log to both services.log and the channel #services */
-	#target = "services.log #services"
-
-	/*
-	 * The source(s) to only accept log messages from. Leave commented to allow all sources.
-	 * This can be a users name, a channel name, one of our clients (eg, OperServ), or a server name.
-	 */
-	#source = ""
-
-	/*
-	 * The number of days to keep logfiles, only useful if you are logging to a file.
-	 * Set to 0 to never delete old logfiles.
-	 *
-	 * Note that Anope must run 24 hours a day for this feature to work correctly.
-	 */
-	logage = 7
-
-	/*
-	 * Enable to have the core services clients join and stay in the log channel(s) when logging.
-	 * Note: on some IRCds this is not optional, and is enforced on.
-	 */
-	inhabitlogchannel = yes
 
+service
+{
 	/*
-	 * What types of log messages should be logged by this block. There are nine general categories:
-	 *
-	 *  admin      - Execution of admin commands (OperServ, etc).
-	 *  override   - A services operator using their powers to execute a command they couldn't normally.
-	 *  commands   - Execution of general commands.
-	 *  servers    - Server actions, linking, squitting, etc.
-	 *  channels   - Actions in channels such as joins, parts, kicks, etc.
-	 *  users      - User actions such as connecting, disconnecting, changing name, etc.
-	 *  other      - All other messages without a category.
-	 *  rawio      - Logs raw input and output from services
-	 *  debug      - Debug messages (log files can become VERY large from this).
-	 *
-	 * These options determine what messages from the categories should be logged. Wildcards are accepted, and
-	 * you can also negate values with a ~. For example, "~operserv/akill operserv/*" would log all operserv
-	 * messages except for operserv/akill. Note that processing stops at the first matching option, which
-	 * means "* ~operserv/*" would log everything because * matches everything.
-	 *
-	 * Valid admin, override, and command options are:
-	 *    pesudo-serv/commandname (eg, operserv/akill, chanserv/set)
-	 *
-	 * Valid server options are:
-	 *    connect, quit, sync
-	 *
-	 * Valid channel options are:
-	 *    create, destroy, join, part, kick, leave, mode
-	 *
-	 * Valid user options are:
-	 *    connect, disconnect, quit, nick, ident, host, mode, maxusers
-	 *
-	 * Rawio and debug are simple yes/no answers, there are no types for them.
-	 *
-	 * Note that modules may add their own values to these options.
+	 * The nick, user name, host, and real name of the service.
 	 */
-	admin = "operserv/*"
-	override = "chanserv/* nickserv/* memoserv/set botserv/* ~botserv/set"
-	commands = "~operserv/* *"
-	servers = "*"
-	#channels = "~mode *"
-	users = "connect disconnect nick"
-	other = "*"
-	rawio = no
-	debug = no
+	 nick = "BotServ"
+	 user = "services"
+	 host = "localhost.net"
+	 gecos = "Bot Service"
 }
 
-/*
- * A log block to globops some useful things.
- */
-log
+service
 {
-	target = "globops"
-	admin = "global/* operserv/mode operserv/kick opeserv/akill operserv/s*line operserv/noop operserv/jupe */forbid nickserv/getpass */drop"
-}
-
-/*
- * [RECOMMENDED] Oper Access Config
- *
- * This section is used to set up staff access to restricted oper only commands.
- * You may define groups of commands and privileges, as well as who may use them.
- *
- * This block is recommended, as without it you will be unable to access most oper commands.
- * It replaces the old ServicesRoot directive amongst others.
- *
- * Note that third party modules may add additional commands and privileges to this list.
- *
- * Available privileges:
- *  botserv/administration        - Can perform certain BotServ administrative tasks
- *  chanserv/access/modify        - Can modify channel access and akick lists
- *  chanserv/auspex               - Can see any information with /chanserv info
- *  chanserv/no-register-limit    - May register an unlimited number of channels and nicknames
- *  chanserv/set                  - Can modify the settings of any channel (incl. changing of the owner and password!)
- *  memoserv/info                 - Can see any information with /memoserv info
- *  memoserv/set-limit            - Can set the limit of max stored memos on any user and channel
- *  memoserv/no-limit             - Can send memos through limits and throttles
- *  nickserv/auspex               - Can see any information with /nickserv info
- *  nickserv/confirm              - Can confirm other users nicknames
- *  nickserv/drop                 - Can drop other users nicks
- *
- * Available commands:
- *   botserv/bot/del       botserv/bot/add       botserv/bot/change  botserv/assign/private
- *   botserv/botlist       botserv/set/private   botserv/set/nobot
- *
- *   chanserv/access/list     chanserv/drop                 chanserv/forbid           chanserv/getkey
- *   chanserv/list            chanserv/suspend              chanserv/topic            chanserv/status
- *   chanserv/mode
- *
- *   chanserv/saset/bantype   chanserv/saset/description    chanserv/saset/email      chanserv/saset/entrymsg
- *   chanserv/saset/founder   chanserv/saset/keeptopic      chanserv/saset/opnotice   chanserv/saset/restricted
- *   chanserv/saset/peace     chanserv/saset/persist        chanserv/saset/private
- *   chanserv/saset/secure    chanserv/saset/securefounder  chanserv/saset/secureops
- *   chanserv/saset/signkick  chanserv/saset/successor      chanserv/saset/topiclock
- *   chanserv/saset/url       chanserv/saset/xop
- *
- *   memoserv/sendall        memoserv/staff
- *
- *   nickserv/getpass        nickserv/sendpass      nickserv/getemail   nickserv/suspend
- *   nickserv/resetpass
- *
- *   nickserv/saset/autoop   nickserv/saset/email   nickserv/saset/greet
- *   nickserv/saset/icq      nickserv/saset/kill    nickserv/saset/language nickserv/saset/message
- *   nickserv/saset/private  nickserv/saset/secure  nickserv/saset/url      nickserv/saset/noexpire
- *
- *   hostserv/set            hostserv/del
- *
- *   global/global
- *
- *   operserv/news         operserv/stats        operserv/kick
- *   operserv/mode         operserv/session      operserv/modlist    operserv/ignore
- *   operserv/chankill     operserv/akill        operserv/sqline     operserv/snline
- *   operserv/szline       operserv/staff        operserv/config
- *   operserv/modload      operserv/jupe         operserv/set        operserv/noop
- *   operserv/quit         operserv/update       operserv/reload     operserv/restart
- *   operserv/shutdown     operserv/svsnick      operserv/oline
- *
- * Firstly, we define 'opertypes' which are named whatever we want ('Network Administrator', etc).
- * These can contain commands for oper-only strings (see above) which grants access to that specific command,
- * and privileges (which grant access to more general permissions for the named area).
- * Wildcard entries are permitted for both, e.g. 'commands = "operserv/*"' for all OperServ commands.
- *
- * Below are some default example types, but this is by no means exhaustive,
- * and it is recommended that you configure them to your needs.
- */
-
-opertype
-{
-	/* The name of this opertype */
-	name = "Helper"
-
-	/* What commands (see above) this opertype has */
-	commands = "hostserv/*"
-}
-
-opertype
-{
-	/* The name of this opertype */
-	name = "Services Operator"
-
-	/* What opertype(s) this inherits from. Seperate with a comma. */
-	inherits = "Helper, Another Helper"
-
-	/* What commands (see above) this opertype may use */
-	commands = "chanserv/list chanserv/suspend chanserv/status chanserv/topic memoserv/staff nickserv/sendpass nickserv/resetpass nickserv/suspend operserv/mode operserv/chankill operserv/szline operserv/akill operserv/session operserv/modlist operserv/sqline operserv/staff operserv/kick operserv/ignore operserv/snline"
-
-	/* What privs (see above) this opertype has */
-	privs = "chanserv/auspex chanserv/no-register-limit memoserv/* nickserv/auxpex nickserv/confirm"
-}
-
-opertype
-{
-	name = "Services Administrator"
-
-	inherits = "Services Operator"
-
-	commands = "chanserv/access/list chanserv/drop chanserv/forbid chanserv/getkey chanserv/set/noexpire memoserv/sendall nickserv/saset/* nickserv/getemail operserv/news operserv/jupe operserv/svsnick operserv/stats operserv/oline operserv/noop global/*"
-
-	privs = "*"
+	nick = "ChanServ"
+	user = "services"
+	host = "localhost.net"
+	gecos = "Channel Registration Service"
 }
 
-opertype
+service
 {
-	name = "Services Root"
-
-	commands = "*"
-
-	privs = "*"
-}
-
-/*
- * After defining different types of operators in the above opertype section, we now define who is in these groups
- * through 'oper' blocks, similar to ircd access.
- *
- * The default is to comment these out (so NOBODY will have Services access).
- * You probably want to add yourself and a few other people at minimum.
- *
- * As with all permissions, make sure to only give trustworthy people access to Services.
- */
-
-oper
-{
-	/* The nickname of this services oper */
-	#name = "nick1"
-
-	/* The opertype this person will have */
-	type = "Services Root"
-
-	/* An optional password. If defined the user must login using /operserv login first */
-	#password = "secret"
-
-	/* An optional SSL fingerprint. If defined is required to use this opertype. */
-	#certfp = "ed3383b3f7d74e89433ddaa4a6e5b2d7"
+	nick = "Global"
+	user = "services"
+	host = "localhost.net"
+	gecos = "Global Noticer"
 }
 
-/*
-oper
+service
 {
-	name = "nick2"
-	type = "Services Administrator"
+	nick = "HostServ"
+	user = "services"
+	host = "localhost.net"
+	gecos = "vHost Service"
 }
 
-oper
+service
 {
-	name = "nick3"
-	type = "Helper"
+	nick = "MemoServ"
+	user = "services"
+	host = "localhost.net"
+	gecos = "Memo Service"
 }
-*/
 
-/*
- * [OPTIONAL] Mail Config
- *
- * This section contains settings related to the use of e-mail from Services.
- * If the usemail directive is set to yes, unless specified otherwise, all other
- * directives are required.
- */
-mail
+service
 {
-	/*
-	 * If set, this option enables the mail commands in Services. You may choose
-	 * to disable it if you have no Sendmail-compatible mailer installed. Whilst
-	 * this directive (and entire block) is optional, it is required if the
-	 * nickserv:emailregistration is set to yes.
-	 */
-	usemail = yes
-
-	/*
-	 * This is the command-line that will be used to call the mailer to send an
-	 * e-mail. It must be called with all the parameters needed to make it
-	 * scan the mail input to find the mail recipient; consult your mailer
-	 * documentation.
-	 *
-	 * Postfix users must use the compatible sendmail utility provided with
-	 * it. This one usually needs no parameters on the command-line. Most
-	 * sendmail applications (or replacements of it) require the -t option
-	 * to be used.
-	 */
-	sendmailpath = "/usr/sbin/sendmail -t"
-
-	/*
-	 * This is the e-mail address from which all the e-mails are to be sent from.
-	 * It should really exist.
-	 */
-	sendfrom = "services@localhost.net"
-
-	/*
-	 * If set, SENDPASS and RESETPASS will be restricted to IRC operators.
-	 * This directive is optional.
-	 *
-	 * WARNING: If you choose to not enable this option, you should limit the
-	 * number of processes that the services user can have at a time (you can
-	 * create a special user for this; remember to NEVER launch Services as
-	 * root).
-	 */
-	restrict = yes
-
-	/*
-	 * This controls the minimum amount of time a user must wait before sending
-	 * another e-mail after they have sent one. It also controls the minimum time
-	 * a user must wait before they can receive another e-mail.
-	 *
-	 * This feature prevents users from being mail bombed using Services and
-	 * it is highly recommended that it be used.
-	 *
-	 * This directive is optional, but highly recommended.
-	 */
-	delay = 5m
-
-	/*
-	 * If set, Services will not attempt to put quotes around the TO: fields
-	 * in e-mails.
-	 *
-	 * This directive is optional, and as far as we know, it's only needed
-	 * if you are using ESMTP or QMail to send out e-mails.
-	 */
-	#dontquoteaddresses = yes
+	nick = "NickServ"
+	user = "services"
+	host = "localhost.net"
+	gecos = "Nickname Registration Service"
 }
 
-/*
- * [OPTIONAL] DNS Config
- *
- * This section is used to configure DNS.
- * At this time DNS is only used by a few modules (m_dnsbl)
- * and is not required by the core to function.
- */
-dns
+service
 {
-	/* 
-	 * The nameserver to use for resolving hostnames, must be an IP or a resolver configuration file.
-	 * The below should work fine on all unix like systems. Windows users will have to find their nameservers
-	 * from ipconfig /all and put the IP here
-	 */
-	nameserver = "/etc/resolv.conf"
-	#nameserver = "127.0.0.1"
-
-	/*
-	 * How long to wait in seconds before a DNS query has timed out
-	 */
-	timeout = 5
+	nick = "OperServ"
+	user = "services"
+	host = "localhost.net"
+	gecos = "Operator Service"
 }
 
 /*
- * [RECOMMENDED] NickServ
- *
- * Comment the following line to disable NickServ.
+ * [RECOMMENDED] Core clients
  */
-module { name = "ns_main" }
 
-/*
- * [REQUIRED] NickServ Config
- *
- * This section is used to set up the Nickname Registration Service pseudo-client.
- * Unless specified otherwise, all directives are required.
- */
-nickserv
+module { name = "bs_main" }
+botserv
 {
 	/*
-	 * The nickname of the NickServ client.
-	 */
-	nick = "NickServ"
-
-	/*
-	 * The description of the NickServ client, which will be used as the GECOS 
-	 * (real name) of the client.
+	 * The name of the client that should be BotServ.
+	 * Clients are configured above.
 	 */
-	description = "Nickname Registration Service"
-
-	/*
-	 * The core modules to load for NickServ. This is a space separated list that corresponds
-	 * to the base names of the modules for NickServ.
-	 *
-	 * This directive is optional, but highly recommended.
-	 */
-	modules = "ns_help ns_register ns_group ns_identify ns_access ns_cert ns_set ns_saset ns_set_autoop ns_set_email ns_set_greet ns_set_hide ns_set_kill ns_set_language ns_set_message ns_set_private ns_set_secure ns_saset_noexpire ns_drop ns_recover ns_release ns_sendpass ns_ghost ns_alist ns_info ns_list ns_logout ns_status ns_update ns_getpass ns_getemail ns_suspend ns_resetpass ns_ajoin"
-
-	/*
-	 * Force users to give an e-mail address when they register a nick.
-	 * 
-	 * This directive is recommended to be enabled, and required if e-mail registration is enabled.
-	 */
-	forceemail = yes
-
-	/*
-	 * Require users who change their email address to confirm they
-	 * own it.
-	 */
-	confirmemailchanges = no
-
-	/*
-	 * Require an e-mail to be sent to the user before they can register their nick.
-	 */
-	#emailregistration = yes
+	nick = "BotServ"
 
 	/*
-	 * The default options for newly registered nicks. Note that changing these options
-	 * will have no effect on nicks which are already registered. The list must be separated
+	 * The default bot options for newly registered channels. Note that changing these options
+	 * will have no effect on channels which are already registered. The list must be separated
 	 * by spaces.
 	 *
 	 * The options are:
-	 * -         kill: Kill nick if not identified within 60 seconds
-	 * -    killquick: Kill nick if not identified within 20 seconds, this one overrides the above
-	 *                   option and the above must be specified with this one
-	 * -       secure: Enable nickname security, requiring the nick's password before any operations
-	 *                   can be done on it
-	 * -      private: Hide the nick from NickServ's LIST command
-	 * -    hideemail: Hide's the nick's e-mail address from NickServ's INFO command
-	 * - hideusermask: Hide's the nick's last or current user@host from NickServ's INFO command
-	 * -     hidequit: Hide's the nick's last quit message
-	 * -   memosignon: Notify user if they have a new memo when they sign into the nick
-	 * -  memoreceive: Notify user if they have a new memo as soon as it's received
-	 * -       autoop: User will be automatically opped in channels they enter and have access to
-	 * -          msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires UsePrivmsg
-	 *                   to be enabled as well
-	 *
-	 * This directive is optional, if left blank, the options will default to secure, memosignon, and
-	 * memoreceive. If you really want no defaults, use "none" by itself as the option.
-	 */
-	defaults="secure private hideemail hideusermask memosignon memoreceive autoop"
-
-	/*
-	 * A list of languages to load on startup that will be available in /nickserv set language.
-	 * Useful if you translate Anope to your language. (Explained further in docs/LANGUAGE).
-	 * Note that english should not be listed here because it is the base language.
-	 */
-	languages = "ca_ES de_DE el_GR es_ES fr_FR hu_HU it_IT nl_NL pl_PL pt_PT ru_RU tr_TR"
-
-	/*
-	 * Default language that non- and newly-registered nicks will receive messages in.
-	 * Leave empty to default to English.
-	 */
-	#defaultlanguage = "es_ES"
-
-	/*
-	 * The minimum length of time between consecutive uses of NickServ's REGISTER command. This
-	 * directive is optional, but recommended. If not set, this restriction will be disabled.
-	 */
-	regdelay = 30s
-
-	/*
-	 * The minimum length of time between consecutive uses of NickServ's RESEND command.
-	 *
-	 * This directive is optional, but recommended. If not set, this restriction will be disabled.
-	 */
-	resenddelay = 90s
-
-	/*
-	 * The length of time before a nick registration expires.
-	 *
-	 * This directive is optional, but recommended. If not set, the default is 21 days.
-	 */
-	expire = 21d
-
-	/*
-	 * The length of time before a suspended nick becomes unsuspended.
-	 *
-	 * This directive is optional. If not set, the default is to never.
-	 */
-	#suspendexpire = 90d
-
-	/*
-	 * The length of time a user using an unconfirmed account has
-	 * before the account will be released for general use again.
-	 *
-	 * This directive is only required if the e-mail registration option is enabled.
-	 */
-	#unconfirmedexpire = 1d
-
-	/*
-	 * The maximum number of nicks allowed in a group.
+	 * -    dontkickops: Channel operators will be protected against BotServ kicks
+	 * - dontkickvoices: Voiced users will be protected against BotServ kicks
+	 * -          greet: The channel's BotServ bot will greet incoming users that have set a greet
+	 *                     in their NickServ settings
+	 * -        fantasy: Enables the use of BotServ fantasy commands in the channel
 	 *
-	 * This directive is optional, but recommended. If not set or set to 0, no limits will be applied.
+	 * This directive is optional, if left blank, there will be no defaults.
 	 */
-	maxaliases = 16
+	defaults="greet fantasy"
 
 	/*
-	 * The maximum number of entries allowed on a nickname's access list.
+	 * The minimum number of users there must be in a channel before the bot joins it. The best
+	 * value for this setting is 1 or 2. This can be 0, the service bots will not part unless
+	 * specifically unassigned, and will keep the channel open.
 	 */
-	accessmax = 32
+	minusers = 1
 
 	/*
-	 * The username (and possibly hostname) used for the fake user created when NickServ collides
-	 * a user. Should be in the user@host format. If the host is not given, the one from ServicesUser
-	 * is used.
+	 * The maximum number of entries a single bad words list can have. Setting it too high can
+	 * reduce performance slightly.
 	 */
-	enforceruser = "enforcer"
-	#enforceruser = "enforcer@localhost.net"
+	badwordsmax = 32
 
 	/*
-	 * The delay before a NickServ collided nick is released.
+	 * The amount of time that data for a user is valid in BotServ. If the data exceeds this time,
+	 * it is reset or deleted depending on the case. Do not set it too high, otherwise your
+	 * resources will be slightly affected.
 	 */
-	releasetimeout = 1m
+	keepdata = 10m
 
 	/*
-	 * Allow the use of the IMMED option in the NickServ SET KILL command.
+	 * The bots are currently not affected by any modes or bans when they try to join a channel.
+	 * But some people may want to make it act like a real bot, that is, for example, remove all
+	 * the bans affecting the bot before joining the channel, remove a ban that affects the bot
+	 * set by a user when it is in the channel, and so on. Since it consumes a bit more CPU
+	 * time, you should not enable this on larger networks.
 	 *
 	 * This directive is optional.
 	 */
-	#allowkillimmed = yes
-
-	/*
-	 * If set, the NickServ GROUP command won't allow any group change. This is recommended for
-	 * better performance and to protect against nick stealing, however users will have less
-	 * flexibility.
-	 *
-	 * This directive is optional, but recommended.
-	 */
-	#nogroupchange = yes
+	#smartjoin = yes
 
 	/*
-	 * Limits the use of the NickServ LIST command to IRC operators.
+	 * If set, the bots will use a kick reason that does not state the word when it is kicking.
+	 * This is especially useful if you have young people on your network.
 	 *
 	 * This directive is optional.
 	 */
-	#listopersonly = yes
-
-	/*
-	 * The maximum number of nicks to be returned for a NickServ LIST command.
-	 */
-	listmax = 50
-
-	/*
-	 * When a user's nick is forcibly changed to enforce a "nick kill", their new nick will start
-	 * with this value. The rest will be made up of 6 or 7 digits.
-	 */
-	guestnickprefix = "Guest"
-
-	/*
-	 * Prevents the use of the DROP, FORBID, GETPASS, and SET PASSWORD commands by Services Admins
-	 * on other Services Admins or the Services Root(s).
-	 *
-	 * This directive is optional, but recommended.
-	 */
-	secureadmins = yes
-
-	/*
-	 * If set, any user wanting to use the privileges of Services Root, Services Admin, or Services
-	 * Operator must have been logged as an IRC Operator with the /oper command.
-	 *
-	 * This directive is optional, but recommended.
-	 */
-	strictprivileges = yes
+	gentlebadwordreason = yes
 
 	/*
-	 * If set, Services will set the channel modes a user has access to upon identifying, assuming
-	 * they are not already set.
+	 * If set, BotServ will use case sensitive checking for badwords.
 	 *
 	 * This directive is optional.
 	 */
-	modeonid = yes
-
-	/*
-	 * If set, Services will add the usermask of registering users to the access list of their
-	 * newly created account. If not set, users will always have to identify to NickServ before
-	 * being recognized, unless they manually add an address to the access list of their account.
-	 * This directive is optional.
-	 */
-	addaccessonreg = yes
+	#casesensitive = yes
 
 	/*
-	 * The maximum number of channels a user can have on NickServ's AJOIN command.
+	 * Defines the prefix for fantasy commands in channels. This character will have to be prepended
+	 * to all fantasy commands. If you choose "!", for example, fantasy commands will be "!kick",
+	 * "!op", etc. This directive is optional, if left out, the default fantasy character is "!".
 	 */
-	ajoinmax = 10
+	#fantasycharacter = "!"
 }
 
 /*
- * [RECOMMENDED] ChanServ
+ * [RECOMMENDED] Core ChanServ module.
  *
- * Comment the following line to disable ChanServ.
+ * Provides essential functionality for ChanServ
  */
 module { name = "cs_main" }
 
-/*
- * [RECOMMENDED] ChanServ Config
- *
- * This section is used to set up the Channel Registration Service pseudo-client.
- * Unless specified otherwise, all directives are required if you wish to use ChanServ.
- */
 chanserv
 {
 	/*
-	 * The nickname of the ChanServ client.
+	 * The name of the client that should be ChanServ. Clients are configured
+	 * with the service blocks.
 	 */
-	nick = "ChanServ"
-
-	/*
-	 * The description of the ChanServ client, which will be used as the GECOS 
-	 * (real name) of the client.
-	 */
-	description = "Channel Registration Service"
-
-	/*
-	 * The core modules to load for ChanServ. This is a space separated list that corresponds
-	 * to the base names of the modules for ChanServ.
-	 *
-	 * This directive is optional, but highly recommended.
-	 */
-	modules = "cs_help cs_register cs_set cs_saset cs_saset_noexpire cs_set_bantype cs_set_description cs_set_founder cs_set_keeptopic cs_set_opnotice cs_set_peace cs_set_persist cs_set_private cs_set_restricted cs_set_secure cs_set_securefounder cs_set_secureops cs_set_signkick cs_set_successor cs_set_topiclock cs_set_xop cs_xop cs_access cs_akick cs_drop cs_ban cs_clearusers cs_modes cs_getkey cs_invite cs_kick cs_list cs_topic cs_info cs_suspend cs_status cs_unban cs_clone cs_mode"
+	name = "ChanServ"
 
 	/*
 	 * The default options for newly registered channels. Note that changing these options
@@ -1177,38 +740,63 @@ chanserv
 	#opersonly = yes
 }
 
-/*
- * [OPTIONAL] MemoServ
- *
- * Comment the following line to disable MemoServ.
- */
-module { name = "ms_main" }
-
-/* [OPTIONAL] MemoServ configuration
- * 
- * This section is used to set up the Memo Service pseudo-client. This is only required if ms_main
- * is being loaded.
- */
-memoserv
+module { name = "gl_main" }
+global
 {
 	/*
-	 * The nickname of the MemoServ client.
+	 * The name of the client that should be Global. Clients are configured
+	 * with the service blocks.
 	 */
-	nick = "MemoServ"
+	name = "Global"
 
 	/*
-	 * The description of the MemoServ client, which will be used as the GECOS
-	 * (real name) of the client.
+	 * If set, Services will send global messages on starting up and shutting
+	 * down/restarting.
+	 *
+	 * This directive is optional.
 	 */
-	description = "Memo Service"
+	#globaloncycle = yes
 
 	/*
-	 * The core modules to load for MemoServ. This is a space separated list that corresponds
-	 * to the base names of the modules for MemoServ.
-	 * 
-	 * This directive is optional, but highly recommended.
+	 * This is the global message that will be sent when Services are being
+	 * shutdown/restarted. This directive is only required if you enable
+	 * globaloncycle above.
+	 */
+	globaloncycledown = "Services are restarting, they will be back shortly - please be good while we're gone"
+
+	/*
+	 * This is the global message that will be sent when Services (re)join the
+	 * network. This directive is only required if you enable globaloncycle above.
+	 */
+	globaloncycleup = "Services are now back online - have a nice day"
+
+	/*
+	 * If set, Services will hide the IRC operator's nick in a global
+	 * message/notice.
+	 *
+	 * This directive is optional.
+	 */
+	#anonymousglobal = yes
+}
+
+module { name = "hs_main" }
+hostserv
+{
+	/*
+	 * The name of the client that should be HostServ. Clients are configured
+	 * with the service blocks.
+	 */
+	name = "HostServ"
+}
+
+module { name = "ms_main" }
+memoserv
+{
+	/*
+	 * The name of the client that should be MemoServ. Clients are configured
+	 * with the service blocks.
 	 */
-	modules = "ms_send ms_cancel ms_list ms_read ms_del ms_set ms_info ms_rsend ms_check ms_staff ms_sendall ms_ignore ms_help"
+	name = "MemoServ"
 
 	/*
 	 * The maximum number of memos a user is allowed to keep by default. Normal users may set the
@@ -1241,180 +829,211 @@ memoserv
 	#memoreceipt = 1
 }
 
-/*
- * [OPTIONAL] BotServ
- *
- * Comment the following line to disable BotServ.
- */
-module { name = "bs_main" }
-
-/* [OPTIONAL] BotServ configuration
- * 
- * This section is used to set up the Bot Service pseudo-client. This is only required if ms_main
- * is being loaded.
- */
-botserv
+module { name = "ns_main" }
+nickserv
 {
 	/*
-	 * The nickname of the BotServ client.
+	 * The name of the client that should be NickServ. Clients are configured
+	 * with the service blocks.
 	 */
-	nick = "BotServ"
+	name = "NickServ"
 
 	/*
-	 * The description of the BotServ client, which will be used as the GECOS
-	 * (real name) of the client.
+	 * Force users to give an e-mail address when they register a nick.
+	 * 
+	 * This directive is recommended to be enabled, and required if e-mail registration is enabled.
 	 */
-	description = "Bot Service"
+	forceemail = yes
 
 	/*
-	 * The core modules to load for BotServ. This is a space separated list that corresponds
-	 * to the base names of the modules for BotServ. 
-	 *
-	 * This directive is optional, but highly recommended.
+	 * Require users who change their email address to confirm they
+	 * own it.
 	 */
-	modules = "bs_help bs_botlist bs_assign bs_set bs_kick bs_badwords bs_act bs_info bs_say bs_unassign bs_bot"
+	confirmemailchanges = no
 
 	/*
-	 * The default bot options for newly registered channels. Note that changing these options
-	 * will have no effect on channels which are already registered. The list must be separated
+	 * Require an e-mail to be sent to the user before they can register their nick.
+	 */
+	#emailregistration = yes
+
+	/*
+	 * The default options for newly registered nicks. Note that changing these options
+	 * will have no effect on nicks which are already registered. The list must be separated
 	 * by spaces.
 	 *
 	 * The options are:
-	 * -    dontkickops: Channel operators will be protected against BotServ kicks
-	 * - dontkickvoices: Voiced users will be protected against BotServ kicks
-	 * -          greet: The channel's BotServ bot will greet incoming users that have set a greet
-	 *                     in their NickServ settings
-	 * -        fantasy: Enables the use of BotServ fantasy commands in the channel
-	 * -      symbiosis: Causes the BotServ bot to do all actions that would normally have been
-	 *                     done by ChanServ
+	 * -         kill: Kill nick if not identified within 60 seconds
+	 * -    killquick: Kill nick if not identified within 20 seconds, this one overrides the above
+	 *                   option and the above must be specified with this one
+	 * -       secure: Enable nickname security, requiring the nick's password before any operations
+	 *                   can be done on it
+	 * -      private: Hide the nick from NickServ's LIST command
+	 * -    hideemail: Hide's the nick's e-mail address from NickServ's INFO command
+	 * - hideusermask: Hide's the nick's last or current user@host from NickServ's INFO command
+	 * -     hidequit: Hide's the nick's last quit message
+	 * -   memosignon: Notify user if they have a new memo when they sign into the nick
+	 * -  memoreceive: Notify user if they have a new memo as soon as it's received
+	 * -       autoop: User will be automatically opped in channels they enter and have access to
+	 * -          msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires UsePrivmsg
+	 *                   to be enabled as well
 	 *
-	 * This directive is optional, if left blank, there will be no defaults.
+	 * This directive is optional, if left blank, the options will default to secure, memosignon, and
+	 * memoreceive. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults="greet fantasy symbiosis"
+	defaults="secure private hideemail hideusermask memosignon memoreceive autoop"
 
 	/*
-	 * The minimum number of users there must be in a channel before the bot joins it. The best
-	 * value for this setting is 1 or 2. This can be 0, the service bots will not part unless
-	 * specifically unassigned, and will keep the channel open.
+	 * A list of languages to load on startup that will be available in /nickserv set language.
+	 * Useful if you translate Anope to your language. (Explained further in docs/LANGUAGE).
+	 * Note that english should not be listed here because it is the base language.
 	 */
-	minusers = 1
+	languages = "ca_ES de_DE el_GR es_ES fr_FR hu_HU it_IT nl_NL pl_PL pt_PT ru_RU tr_TR"
 
 	/*
-	 * The maximum number of entries a single bad words list can have. Setting it too high can
-	 * reduce performance slightly.
+	 * Default language that non- and newly-registered nicks will receive messages in.
+	 * Leave empty to default to English.
 	 */
-	badwordsmax = 32
+	#defaultlanguage = "es_ES"
 
 	/*
-	 * The amount of time that data for a user is valid in BotServ. If the data exceeds this time,
-	 * it is reset or deleted depending on the case. Do not set it too high, otherwise your
-	 * resources will be slightly affected.
+	 * The minimum length of time between consecutive uses of NickServ's REGISTER command. This
+	 * directive is optional, but recommended. If not set, this restriction will be disabled.
 	 */
-	keepdata = 10m
+	regdelay = 30s
 
 	/*
-	 * The bots are currently not affected by any modes or bans when they try to join a channel.
-	 * But some people may want to make it act like a real bot, that is, for example, remove all
-	 * the bans affecting the bot before joining the channel, remove a ban that affects the bot
-	 * set by a user when it is in the channel, and so on. Since it consumes a bit more CPU
-	 * time, you should not enable this on larger networks.
+	 * The minimum length of time between consecutive uses of NickServ's RESEND command.
 	 *
-	 * This directive is optional.
+	 * This directive is optional, but recommended. If not set, this restriction will be disabled.
 	 */
-	#smartjoin = yes
+	resenddelay = 90s
 
 	/*
-	 * If set, the bots will use a kick reason that does not state the word when it is kicking.
-	 * This is especially useful if you have young people on your network.
+	 * The length of time before a nick registration expires.
 	 *
-	 * This directive is optional.
+	 * This directive is optional, but recommended. If not set, the default is 21 days.
 	 */
-	gentlebadwordreason = yes
+	expire = 21d
 
 	/*
-	 * If set, BotServ will use case sensitive checking for badwords.
+	 * The length of time before a suspended nick becomes unsuspended.
 	 *
-	 * This directive is optional.
+	 * This directive is optional. If not set, the default is to never.
 	 */
-	#casesensitive = yes
+	#suspendexpire = 90d
 
 	/*
-	 * Defines the prefix for fantasy commands in channels. This character will have to be prepended
-	 * to all fantasy commands. If you choose "!", for example, fantasy commands will be "!kick",
-	 * "!op", etc. This directive is optional, if left out, the default fantasy character is "!".
+	 * The length of time a user using an unconfirmed account has
+	 * before the account will be released for general use again.
+	 *
+	 * This directive is only required if the e-mail registration option is enabled.
 	 */
-	#fantasycharacter = "!"
-}
+	#unconfirmedexpire = 1d
 
-/*
- * [OPTIONAL] HostServ
- *
- * Comment the following line to disable HostServ.
- */
-module { name = "hs_main" }
+	/*
+	 * The maximum number of nicks allowed in a group.
+	 *
+	 * This directive is optional, but recommended. If not set or set to 0, no limits will be applied.
+	 */
+	maxaliases = 16
 
-/*
- * [OPTIONAL] HostServ Config
- *
- * This section is used to set up the vHost Service pseudo-client.
- *
- * Unless specified otherwise, all directives are required if you do wish to use HostServ.
- */
-hostserv
-{
 	/*
-	 * The nickname of the HostServ client.
+	 * The maximum number of entries allowed on a nickname's access list.
 	 */
-	nick = "HostServ"
+	accessmax = 32
 
 	/*
-	 * The description of the HostServ client, which will be used as the GECOS
-	 * (real name) of the client.
+	 * The username (and possibly hostname) used for the fake user created when NickServ collides
+	 * a user. Should be in the user@host format.
 	 */
-	description = "vHost Service"
+	enforceruser = "enforcer"
+	enforcerhost = "localhost.net"
 
 	/*
-	 * The core modules to load for HostServ. This is a space separated list that corresponds
-	 *