From e1ce6174cee90b71dc461be39d2bf20965ff69e0 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 3 Jan 2014 19:54:14 -0500 Subject: [PATCH] Move modules/stats under extras because it depends on m_mysql, update its config a bit to look similar to all of the other config files --- data/irc2sql.example.conf | 113 +++++++++--------- .../{ => extra}/stats/cs_fantasy_stats.cpp | 0 modules/{ => extra}/stats/cs_fantasy_top.cpp | 0 .../{ => extra}/stats/irc2sql/CMakeLists.txt | 0 modules/{ => extra}/stats/irc2sql/irc2sql.cpp | 0 modules/{ => extra}/stats/irc2sql/irc2sql.h | 0 modules/{ => extra}/stats/irc2sql/tables.cpp | 0 modules/{ => extra}/stats/irc2sql/utils.cpp | 0 modules/{ => extra}/stats/m_chanstats.cpp | 0 9 files changed, 56 insertions(+), 57 deletions(-) rename modules/{ => extra}/stats/cs_fantasy_stats.cpp (100%) rename modules/{ => extra}/stats/cs_fantasy_top.cpp (100%) rename modules/{ => extra}/stats/irc2sql/CMakeLists.txt (100%) rename modules/{ => extra}/stats/irc2sql/irc2sql.cpp (100%) rename modules/{ => extra}/stats/irc2sql/irc2sql.h (100%) rename modules/{ => extra}/stats/irc2sql/tables.cpp (100%) rename modules/{ => extra}/stats/irc2sql/utils.cpp (100%) rename modules/{ => extra}/stats/m_chanstats.cpp (100%) diff --git a/data/irc2sql.example.conf b/data/irc2sql.example.conf index 8872b8817..25327387b 100644 --- a/data/irc2sql.example.conf +++ b/data/irc2sql.example.conf @@ -3,63 +3,6 @@ * */ -module -{ - name = "irc2sql" - - /* - * The name of this engine. - * This must match with the name in the mysql{ } block - */ - engine ="mysql/main" - - /* - * An optional prefix to prepended to the name of each created table. - * Do not use the same prefix for other programs. - */ - - prefix = "anope_" - - /* - * GeoIP - Automagically add a users geoip to the user table. - * Tables are created by irc2sql, you have to run the - * geoipupdate script after you started anope to download - * and import the actual geoip database - * - */ - - /* - * Enable GeoIP Lookup - */ - GeoIPLookup = yes - - /* - * Chose between the smaller 'country' or the bigger 'city' database. - * - */ - GeoIPDatabase = "country" - - /* - * The name of the client that should send the CTCP VERSION requests. - * It must already exist or must be defined in the following service block. - */ - client = "StatServ" - - /* - * Get the CTCP version from users - * The users connecting to the network will receive a CTCP VERSION - * request from the above configured services client - */ - ctcpuser = "yes" - - /* - * Send out CTCP VERSION requests to users during burst. - * Disable this if you restart Anope often and don't want to - * annoy your users. - */ - ctcpeob = "yes" -} - service { /* @@ -104,3 +47,59 @@ service */ #channels = "@#services,#mychan" } + +module +{ + name = "irc2sql" + + /* + * The name of the client that should send the CTCP VERSION requests. + * It must already exist or must be defined in the following service block. + */ + client = "StatServ" + + /* + * The name of the SQL engine to use. + * This must be MySQL and must match the name in the mysql{} block + */ + engine = "mysql/main" + + /* + * An optional prefix to prepended to the name of each created table. + * Do not use the same prefix for other programs. + */ + prefix = "anope_" + + /* + * GeoIP - Automagically add a users geoip to the user table. + * Tables are created by irc2sql, you have to run the + * geoipupdate script after you started Anope to download + * and import the GeoIP database. + */ + + /* + * Enable GeoIP Lookup + */ + GeoIPLookup = yes + + /* + * Chose between the smaller 'country' or the bigger 'city' database. + * + */ + GeoIPDatabase = "country" + + /* + * Get the CTCP version from users + * The users connecting to the network will receive a CTCP VERSION + * request from the above configured services client + */ + ctcpuser = "yes" + + /* + * Send out CTCP VERSION requests to users during burst. + * Disable this if you restart Anope often and don't want to + * annoy your users. + */ + ctcpeob = "yes" +} + diff --git a/modules/stats/cs_fantasy_stats.cpp b/modules/extra/stats/cs_fantasy_stats.cpp similarity index 100% rename from modules/stats/cs_fantasy_stats.cpp rename to modules/extra/stats/cs_fantasy_stats.cpp diff --git a/modules/stats/cs_fantasy_top.cpp b/modules/extra/stats/cs_fantasy_top.cpp similarity index 100% rename from modules/stats/cs_fantasy_top.cpp rename to modules/extra/stats/cs_fantasy_top.cpp diff --git a/modules/stats/irc2sql/CMakeLists.txt b/modules/extra/stats/irc2sql/CMakeLists.txt similarity index 100% rename from modules/stats/irc2sql/CMakeLists.txt rename to modules/extra/stats/irc2sql/CMakeLists.txt diff --git a/modules/stats/irc2sql/irc2sql.cpp b/modules/extra/stats/irc2sql/irc2sql.cpp similarity index 100% rename from modules/stats/irc2sql/irc2sql.cpp rename to modules/extra/stats/irc2sql/irc2sql.cpp diff --git a/modules/stats/irc2sql/irc2sql.h b/modules/extra/stats/irc2sql/irc2sql.h similarity index 100% rename from modules/stats/irc2sql/irc2sql.h rename to modules/extra/stats/irc2sql/irc2sql.h diff --git a/modules/stats/irc2sql/tables.cpp b/modules/extra/stats/irc2sql/tables.cpp similarity index 100% rename from modules/stats/irc2sql/tables.cpp rename to modules/extra/stats/irc2sql/tables.cpp diff --git a/modules/stats/irc2sql/utils.cpp b/modules/extra/stats/irc2sql/utils.cpp similarity index 100% rename from modules/stats/irc2sql/utils.cpp rename to modules/extra/stats/irc2sql/utils.cpp diff --git a/modules/stats/m_chanstats.cpp b/modules/extra/stats/m_chanstats.cpp similarity index 100% rename from modules/stats/m_chanstats.cpp rename to modules/extra/stats/m_chanstats.cpp