summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorNaram Qashat <cyberbotx@cyberbotx.com>2010-06-20 18:51:03 -0400
committerNaram Qashat <cyberbotx@cyberbotx.com>2010-06-20 18:51:03 -0400
commit63d7bee2a65c6d389219e5bc09d0fdf4f357b9a1 (patch)
tree595c9c0d05539b7418b04595e231665479a2d2b0 /data
parent381c9c8870fad4c544f29deec22ba4be3549a731 (diff)
parente8a1570ed9f7b839a361169c141956978348acf8 (diff)
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Conflicts: include/config.h
Diffstat (limited to 'data')
-rw-r--r--data/example.conf18
1 files changed, 11 insertions, 7 deletions
diff --git a/data/example.conf b/data/example.conf
index 90864f96a..2258b4924 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -202,12 +202,6 @@ serverinfo
networkinfo
{
/*
- * For the given channel, every user that has or gets op status of the channel
- * will automatically receive the +h user mode. This directive is optional.
- */
- helpchannel = "#help"
-
- /*
* If set, Services will output log messages to the given channel. This
* directive is optional.
*
@@ -967,7 +961,7 @@ chanserv
* 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_set_bantype cs_set_description cs_set_email cs_set_entrymsg cs_set_founder cs_set_keeptopic cs_set_mlock 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_url cs_set_xop cs_xop cs_access cs_akick cs_drop cs_ban cs_clear cs_modes cs_getkey cs_invite cs_kick cs_list cs_topic cs_info forbid cs_suspend cs_status cs_unban"
+ modules = "cs_help cs_register cs_set cs_saset cs_set_bantype cs_set_description cs_set_email cs_set_entrymsg cs_set_founder cs_set_keeptopic cs_set_mlock 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_url cs_set_xop cs_xop cs_access cs_akick cs_drop cs_ban cs_clear cs_modes cs_getkey cs_invite cs_kick cs_list cs_topic cs_info cs_forbid cs_suspend cs_status cs_unban"
/*
* The default options for newly registered channels. Note that changing these options
@@ -1565,6 +1559,16 @@ db_plain
database = "anope.db"
}
+modules { name = "m_helpchan" }
+m_helpchan
+{
+ /*
+ * For the given channel, every user that has or gets op status of the channel
+ * will automatically receive the +h user mode. This directive is optional.
+ */
+ helpchannel = "#help"
+}
+
hs_request
{
/*