From 583954d3a1db658281a9afb7b7dd6773726c8c11 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 28 Apr 2011 22:44:34 -0400 Subject: Use module type to determine what type each module is instead of its location in the configuration file. --- data/example.conf | 156 +++++++++++++++++++++++++++--------------------------- 1 file changed, 77 insertions(+), 79 deletions(-) (limited to 'data') diff --git a/data/example.conf b/data/example.conf index 24120d128..c9ffc04df 100644 --- a/data/example.conf +++ b/data/example.conf @@ -88,7 +88,7 @@ uplink * * NOTE: On some shell providers, this will not be an option. */ - host = "localhost" + host = "127.0.0.1" /* * Enable if Services should connect using IPv6. @@ -149,21 +149,6 @@ serverinfo */ #localhost = "nowhere." - /* - * This directive instructs Anope which IRCd Protocol to speak when connecting. - * You MUST modify this to match the IRCd you run. - * - * Supported: - * - inspircd11 - * - inspircd12 - * - inspircd20 - * - ratbox - * - bahamut - * - unreal32 - * - plexus - */ - type = "inspircd12" - /* * What Server ID to use for this connection? * Note: This should *ONLY* be used for TS6/P10 IRCds. Refer to your IRCd documentation @@ -190,6 +175,22 @@ serverinfo motd = "services.motd" } +/* + * [REQUIRED] Protocol module + * This directive tells Anope which IRCd Protocol to speak when connecting. + * You MUST modify this to match the IRCd you run. + * + * Supported: + * - bahamut + * - inspircd11 + * - inspircd12 + * - inspircd20 + * - plexus + * - ratbox + * - unreal + */ +module { name = "inspircd12" } + /* * [REQUIRED] Network Information * @@ -233,68 +234,6 @@ networkinfo */ options { - /* - * The encryption modules are used when dealing with passwords. This determines how - * the passwords are stored in the databases, and does not add any security as - * far as transmitting passwords over the network goes. - * - * When using enc_none, passwords will be stored without encryption in plain - * text, allowing for passwords to be recovered later but isn't secure therefore - * is not recommended. - * - * The other encryption modules use one-way encryption, so the passwords can not - * be recovered later if those are used. - * - * NOTE: enc_old is Anope's previous (broken) MD5 implementation, if your databases - * were made using that module, continue to use it and do not use enc_md5. - * - * NOTE: enc_sha1 relies on how the OS stores 2+ byte data internally, and is - * potentially broken when moving between 2 different OSes, such as moving from - * Linux to Windows. It is recommended that you use enc_sha256 instead if you want - * to use an SHA-based encryption. If you choose to do so, it is also recommended - * that you first try to get everyone's passwords converted to enc_sha256 before - * switching OSes by placing enc_sha256 at the beginning of the list. - * - * Supported: - * - enc_none (plain text, no encryption) - * - enc_old (old, broken MD5 encryption) - * - enc_md5 (working MD5 encryption) - * - enc_sha1 (SHA1 encryption) - * - enc_sha256 (SHA256 encryption with random salts) - * - * The first module in this list is the active encryption module. All new passwords are - * encrypted by this module. Old passwords stored in another encryption method are - * automatically re-encrypted by the active encryption module on next identify. - * Changing the order of the modules requires the services to restart. - */ - encryption = "enc_md5 enc_none enc_sha1 enc_sha256 enc_old" - - /* - * The database modules are used for saving and loading databases for Anope. - * - * Supported: - * - db_plain - * - db_mysql - * - db_mysql_live - * - * You may have more than one loaded at once! - * - * The db_mysql_live module is an extension to db_mysql, and should only be used if - * db_mysql is being used. This module pulls data in real time from SQL as it is - * requested by the core as a result of someone executing commands. - * - * This effectively allows you to edit your database and have it be immediately - * reflected back in Anope. - * - * For information on how to make db_mysql_live use asynchronous queries see - * m_async_commands. - * - * At this time db_mysql_live only supports pulling data in real time from the three - * main tables: anope_cs_info, anope_ns_alias, and anope_ns_core. - * - */ - database = "db_plain" - /* * The maximum length of passwords */ @@ -1888,8 +1827,10 @@ cs_set_misc /* * db_plain * - * This is the default flatfile database format + * This is the default flatfile database format. You must have at least one database + * module loaded or Anope will not save databases! */ +module { name = "db_plain" } db_plain { /* @@ -1898,6 +1839,63 @@ db_plain database = "anope.db" } +/* + * db_mysql and db_mysql_live + * + * Enables (live) MySQL support. + * + * The db_mysql_live module is an extension to db_mysql, and should only be used if + * db_mysql is being used. This module pulls data in real time from SQL as it is + * requested by the core as a result of someone executing commands. + * + * This effectively allows you to edit your database and have it be immediately + * reflected back in Anope. + * + * For information on how to make db_mysql_live use asynchronous queries see + * m_async_commands. + * + * At this time db_mysql_live only supports pulling data in real time from the three + * main tables: anope_cs_info, anope_ns_alias, and anope_ns_core. + */ +#module { name = "db_mysql" } +#module { name = "db_mysql_live" } + +/* + * The encryption modules are used when dealing with passwords. This determines how + * the passwords are stored in the databases, and does not add any security as + * far as transmitting passwords over the network goes. + * + * Without any encryption modules, passwords will be stored in plain text, allowing + * for passwords to be recovered later but isn't secure therefore is not recommended. + * + * The other encryption modules use one-way encryption, so the passwords can not + * be recovered later if those are used. + * + * NOTE: enc_old is Anope's previous (broken) MD5 implementation, if your databases + * were made using that module, continue to use it and do not use enc_md5. + * + * NOTE: enc_sha1 relies on how the OS stores 2+ byte data internally, and is + * potentially broken when moving between 2 different OSes, such as moving from + * Linux to Windows. It is recommended that you use enc_sha256 instead if you want + * to use an SHA-based encryption. If you choose to do so, it is also recommended + * that you first try to get everyone's passwords converted to enc_sha256 before + * switching OSes by placing enc_sha256 at the beginning of the list. + * + * The first encryption module loaded is the primary encryption module. All new passwords are + * encrypted by this module. Old passwords stored in another encryption method are + * automatically re-encrypted by the active encryption module on next identify. + */ +module { name = "enc_md5" } +#module { name = "enc_sha1" } +#module { name = "enc_sha256" } + +/* + * enc_old is Anope's previous (broken) MD5 implementation, if your databases + * were made using that module, load it here to allow conversion to the primary + * encryption method. + */ +#module { name = "enc_old" } + /* * hs_request * -- cgit