From 73e93305c10f349742fad3b2197c6c5dd3aea34e Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 24 Apr 2010 19:38:17 -0400 Subject: Added nickserv/auspex permission and fixed core modules so they build --- data/example.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'data') diff --git a/data/example.conf b/data/example.conf index b9ee1fd1b..a87478017 100644 --- a/data/example.conf +++ b/data/example.conf @@ -576,6 +576,7 @@ options * 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 + * nickserv/auspex - Can see any information with /nickserv info * nickserv/confirm - Can confirm other users nicknames * nickserv/drop - Can drop other users nicks * -- cgit From 9439cac6b126254bc488c2375b9e7ff5fd4fce74 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 7 May 2010 14:11:21 -0400 Subject: Added m_ssl.cpp which allows Anope to use SSL when connecting to its uplink --- data/example.conf | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'data') diff --git a/data/example.conf b/data/example.conf index a87478017..8f51dd431 100644 --- a/data/example.conf +++ b/data/example.conf @@ -1507,6 +1507,13 @@ module { name = "ns_maxemail" } module { name = "os_info" } module { name = "hs_request" } +/* + * m_ssl + * + * This module uses SSL to connect to the uplink server(s) + */ +module { name = "m_ssl" } + /* * [OPTIONAL] Module-Specific Options * -- cgit From ebfff71599fbedb72009d71cd40c264713b43b5a Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 7 May 2010 15:29:41 -0400 Subject: Made opertypes inheritable --- data/example.conf | 79 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 29 deletions(-) (limited to 'data') diff --git a/data/example.conf b/data/example.conf index 8f51dd431..17672bd6e 100644 --- a/data/example.conf +++ b/data/example.conf @@ -611,29 +611,49 @@ options * Below are some default example types, but this is by no means exhaustive, * and it is recommended that you configure them to your liking. */ + opertype { - // The name of this opertype - name = "Services Root" + /* The name of this opertype */ + name = "Helper" - // What commands (see above) this opertype may use - commands = "*" + /* What privs (see above) this opertype has */ + privs = "hostserv/set" +} - // What privs (see above) this opertype has - privs = "*" +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/clearmodes operserv/modlist operserv/sqline operser/staff operserv/kick operserv/ignore operserv/sgline" + + /* What privs (see above) this opertype has */ + privs = "chanserv/auspex chanserv/no-register-limit memoserv/* nickserv/auxpex nickserv/confirm" } opertype { name = "Services Administrator" - commands = "operserv/global operserv/news operserv/stats operserv/kick operserv/mode operserv/session operserv/modlist operserv/ignore operserv/chankill operserv/akill operserv/sqline operserv/sgline operserv/szline operserv/clearmodes operserv/staff operserv/defcon botserv/* chanserv/* nickserv/* memoserv/*" + + inherits = "Services Operator" + + commands = "chanserv/access/list chanserv/drop chanserv/forbid chansev/getkey chanserv/getkey chanserv/set/noexpire memoserv/sendall nickserv/getemail operserv/global operserv/news operserv/jupe operserv/svsnick operserv/stats operserv/oline operserv/defcon operserv/noop operserv/umode" + privs = "*" } opertype { - name = "Helper" - privs = "hostserv/set" + name = "Services Root" + + commands = "*" + + privs = "*" } /* @@ -645,26 +665,27 @@ opertype * * As with all permissions, make sure to only give trustworthy people access to Services. */ -#oper -#{ -# // The nickname of this services oper -# name = "DukePyrolator" -# -# // The opertype this person will have -# type = "Services Root" -#}# -# -#oper -#{ -# name = "nick1" -# type = "Services Administrator" -#}# -# -#oper -#{ -# name = "nick2" -# type = "Helper" -#} + +oper +{ + /* The nickname of this services oper */ + //name = "nick1" + + /* The opertype this person will have */ + type = "Services Root" +} + +oper +{ + //name = "nick2" + type = "Services Administrator" +} + +oper +{ + //name = "nick3" + type = "Helper" +} /* * [OPTIONAL] Mail Config -- cgit From af805e5b45f75dec7f4ce16ffc322c8880f9859c Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 7 May 2010 21:04:18 -0400 Subject: Allow enabling ssl on a per-uplink basis --- data/example.conf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/example.conf b/data/example.conf index 17672bd6e..aa7d9ab8b 100644 --- a/data/example.conf +++ b/data/example.conf @@ -91,10 +91,16 @@ uplink host = "localhost" /* - * Enable if Services should connect using IPv6 + * Enable if Services should connect using IPv6. */ ipv6 = no + /* + * Enable if Services should connect using SSL. + * You must have m_ssl loaded for this to work. + */ + ssl = no + /* * The port to connect to. * The IRCd *MUST* be configured to listen on this port, and to accept -- cgit From 2fba686904e6f78ebab35df171c5757afeebf05d Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 24 May 2010 23:36:40 -0500 Subject: Burned slist, rewrote operservs XLine code --- data/example.conf | 22 +++++++++++----------- data/tables.sql | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'data') diff --git a/data/example.conf b/data/example.conf index aa7d9ab8b..0954b8d0d 100644 --- a/data/example.conf +++ b/data/example.conf @@ -603,7 +603,7 @@ options * * operserv/global operserv/news operserv/stats operserv/kick * operserv/mode operserv/session operserv/modlist operserv/ignore - * operserv/chankill operserv/akill operserv/sqline operserv/sgline + * operserv/chankill operserv/akill operserv/sqline operserv/snline * operserv/szline operserv/clearmodes operserv/staff operserv/defcon * operserv/modload operserv/jupe operserv/set operserv/noop * operserv/quit operserv/update operserv/reload operserv/restart @@ -636,7 +636,7 @@ opertype 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/clearmodes operserv/modlist operserv/sqline operser/staff operserv/kick operserv/ignore operserv/sgline" + 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/clearmodes 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" @@ -1264,7 +1264,7 @@ operserv * The core modules to load for OperServ. This is a space separated list that corresponds * to the base names of the modules for OperServ. This directive is optional, but highly recommended. */ - modules = "os_help os_global os_stats os_staff os_mode os_kick os_clearmodes os_akill os_sgline os_sqline os_szline os_chanlist os_userlist os_news os_session os_noop os_jupe os_ignore os_set os_reload os_update os_restart os_quit os_shutdown os_defcon os_chankill os_svsnick os_oline os_umode os_modload os_modunload os_modlist os_modinfo" + modules = "os_help os_global os_stats os_staff os_mode os_kick os_clearmodes os_akill os_snline os_sqline os_szline os_chanlist os_userlist os_news os_session os_noop os_jupe os_ignore os_set os_reload os_update os_restart os_quit os_shutdown os_defcon os_chankill os_svsnick os_oline os_umode os_modload os_modunload os_modlist os_modinfo" /* * If set, Services Admins will be able to use SUPERADMIN [ON|OFF] which will temporarily grant @@ -1280,12 +1280,12 @@ operserv logmaxusers = yes /* - * These define the default expiration times for, respectively, AKILLs, CHANKILLs, SGLINEs, + * These define the default expiration times for, respectively, AKILLs, CHANKILLs, SNLINEs, * SQLINEs, and SZLINEs. */ autokillexpiry = 30d chankillexpiry = 30d - sglineexpiry = 30d + snlineexpiry = 30d sqlineexpiry = 30d szlineexpiry = 30d @@ -1297,11 +1297,11 @@ operserv #akillonadd = yes /* - * If set, this option will make Services send an (SVS)KILL command immediately after SGLINE ADD. - * This eliminates the need for killingthe user after the SGLINE has been added. This directive + * If set, this option will make Services send an (SVS)KILL command immediately after SNLINE ADD. + * This eliminates the need for killingthe user after the SNLINE has been added. This directive * is optional. */ - #killonsgline = yes + #killonsnline = yes /* * If set, this option will make Services send an (SVS)KILL command immediately after SQLINE ADD. @@ -1321,13 +1321,13 @@ operserv * - osclearmodes: OperServ's CLEARMODES command was used * - oskick: OperServ's KICK command was used * - osakill: OperServ's AKILL command was used - * - ossgline: OperServ's SGLINE command was used + * - ossnline: OperServ's SNLINE command was used * - ossqline: OperServ's SQLINE command was used * - osszline: OperServ's SZLINE command was used * - osnoop: OperServ's NOOP command was used * - osjupe: OperServ's JUPE command was used * - akillexpire: An AKILL has expired - * - sglineexpire: An SGLINE has expired + * - snlineexpire: An SNLINE has expired * - sqlineexpire: An SQLINE has expired * - szlineexpire: An SZLINE has expired * - exceptionexpire: A session exception has expired @@ -1340,7 +1340,7 @@ operserv * * This directive is optional, if left blank, there will be no notifications. */ - notifications="osglobal osmode osclearmodes oskick osakill ossgline ossqline osszline osnoop osjupe getpass setpass forbid drop" + notifications="osglobal osmode osclearmodes oskick osakill ossnline ossqline osszline osnoop osjupe getpass setpass forbid drop" /* * Enables session limiting. Session limiting prevents users from connecting more than a certain diff --git a/data/tables.sql b/data/tables.sql index 23ba0ca50..deeef41cc 100644 --- a/data/tables.sql +++ b/data/tables.sql @@ -322,7 +322,7 @@ CREATE TABLE anope_os_core ( maxusercnt int(11) NOT NULL default '0', maxusertime int(10) unsigned NOT NULL default '0', akills_count int(11) NOT NULL default '0', - sglines_count int(11) NOT NULL default '0', + snlines_count int(11) NOT NULL default '0', sqlines_count int(11) NOT NULL default '0', szlines_count int(11) NOT NULL default '0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1; @@ -346,11 +346,11 @@ CREATE TABLE anope_os_exceptions ( -- -------------------------------------------------------- -- --- Table structure for table 'anope_os_sxlines' +-- Table structure for table 'anope_os_xlines' -- -DROP TABLE IF EXISTS anope_os_sxlines; -CREATE TABLE anope_os_sxlines ( +DROP TABLE IF EXISTS anope_os_xlines; +CREATE TABLE anope_os_xlines ( type varchar(20) NOT NULL, mask varchar(255) NOT NULL, xby text NOT NULL, -- cgit From e6447fa2c40270d2e2435229127dd970194b47d9 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 3 Jun 2010 23:09:22 -0400 Subject: Added in a subcommand system and switched ns_set and ns_saset to use it --- data/example.conf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/example.conf b/data/example.conf index 0954b8d0d..0a018a393 100644 --- a/data/example.conf +++ b/data/example.conf @@ -596,8 +596,10 @@ options * * memoserv/sendall memoserv/staff * - * nickserv/getpass nickserv/sendpass nickserv/getemail nickserv/suspend - * nickserv/resetpass + * 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 - Can add/modify/delete any vhost * @@ -648,7 +650,7 @@ opertype inherits = "Services Operator" - commands = "chanserv/access/list chanserv/drop chanserv/forbid chansev/getkey chanserv/getkey chanserv/set/noexpire memoserv/sendall nickserv/getemail operserv/global operserv/news operserv/jupe operserv/svsnick operserv/stats operserv/oline operserv/defcon operserv/noop operserv/umode" + commands = "chanserv/access/list chanserv/drop chanserv/forbid chansev/getkey chanserv/getkey chanserv/set/noexpire memoserv/sendall nickserv/saset/* nickserv/getemail operserv/global operserv/news operserv/jupe operserv/svsnick operserv/stats operserv/oline operserv/defcon operserv/noop operserv/umode" privs = "*" } @@ -782,7 +784,7 @@ nickserv * 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_set ns_saset 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_forbid ns_suspend ns_resetpass" + modules = "ns_help ns_register ns_group ns_identify ns_access ns_set ns_saset ns_set_autoop ns_set_email ns_set_greet ns_set_icq ns_set_kill ns_set_language ns_set_message ns_set_private ns_set_secure ns_set_url 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_forbid ns_suspend ns_resetpass" /* * Force users to give an e-mail address when they register a nick. This directive -- cgit From 7c4a9cf979202ed4307a964a6664d272f1c0785d Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 15 Jun 2010 23:05:05 -0400 Subject: Switched cs_set to the subcommand system and added cs_saset --- data/example.conf | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/example.conf b/data/example.conf index 0a018a393..90864f96a 100644 --- a/data/example.conf +++ b/data/example.conf @@ -590,16 +590,24 @@ options * 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/set/noexpire - * chanserv/status + * chanserv/access/list chanserv/drop chanserv/forbid chanserv/getkey + * chanserv/list chanserv/suspend chanserv/topic chanserv/status * - * memoserv/sendall memoserv/staff + * chanserv/saset/bantype chanserv/saset/description chanserv/saset/email chanserv/saset/entrymsg + * chanserv/saset/founder chanserv/saset/keeptopic chanserv/saset/mlock chanserv/saset/opnotice + * chanserv/saset/peace chanserv/saset/persist chansev/saset/private chanserv/saset/restricted + * 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/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 + * nickserv/saset/private nickserv/saset/secure nickserv/saset/url nickserv/saset/noexpire * * hostserv/set - Can add/modify/delete any vhost * @@ -959,7 +967,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_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 forbid cs_suspend cs_status cs_unban" /* * The default options for newly registered channels. Note that changing these options -- cgit