Merged the /loginmerge branch (topic:192754)

 * the login server storage, ipban and logging systems have been abstracted and now provide a common interface; the rest has been merged into a single login server core (no more login/login_sql duplicity)
 * storage systems are now added via compiler options (WITH_SQL / WITH_TXT)
 * multiple storage engines can be compiled in at the same time, and the config option account.engine defines which one will be used.
 * due to MySQL autoincrement limitations, accounts with id '0' will not be supported; account IDs from this point on should start from '1'.
 * login_log() functions now again record IP addresses in dotted format, not as 4-byte integers (undo from r6868).
 * removed config options that defined column names in the login table
 * removed `memo` and `error message` columns from login db/savefile
 * moved `loginlog` table to the logs database
 * added sql files upgrade_svn12975.sql and upgrade_svn12975_log.sql
 * due to changes to the login table layout, I added an !optional! sql file (upgrade_svn12975_view.sql) that will provide a certain degree of backwards compatibility with existing software; read the instructions inside carefully!
 * moved third-party includes/libs to a separate directory
 * updated project files / makefiles

Changed the way GM levels are handled
 * removed conf/gm_account.txt
 * added the gm level column to the txt savefile (after 'email' column)
 * gm level information is now transferred along with account data
 
For open problems see bugreport:1889.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13000 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 37 insertions, 18 deletions

diff --git a/conf/login_athena.conf b/conf/login_athena.conf
index c5a9fb242..28f022c42 100644
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -38,13 +38,12 @@ console_silent: 0
 // Whether remote administration is enabled or disabled
 admin_state: no
 
-// Administrative password, used by ladmin (perl software) to connect remotely to server.
-// NOTICE: If you enable remote administration, you should change its value for security
-// NOTE: ladmin only works on TXT login servers.
+// Administrative password, used by ladmin to connect remotely to server.
+// NOTICE: you should change this value for security if you use ladmin.
 admin_pass: admin
 
 // Indicate the IP/host that the server accepts for remote administration.
-admin_allowed_ip: 127.0.0.1
+admin_allowed_host: 127.0.0.1
 
 // Console Commands
 // Allow for console commands to be used on/off
@@ -62,15 +61,8 @@ new_account: yes
 allowed_regs: 1
 time_allowed: 10
 
-// Account flatfile database, stores account information.
-account_filename: save/account.txt
-
-// What account AIDs have GM privs, and what level?
-gm_account_filename: conf/GM_account.txt
-
-// Timer to check if GM_account file has been changed and reload GM account automaticaly
-// (in seconds; default: 15; value: 0 (disabled), or 2 or more)
-gm_account_filename_check_timer: 15
+// Log Filename. All operations received by the server are logged in this file. 
+login_log_filename: log/login.log
 
 // To log the login server?
 // NOTE: The login-sql server needs the login logs to enable dynamic pass failure bans.
@@ -110,11 +102,18 @@ client_version_to_connect: 20
 use_MD5_passwords: no
 
 // Ipban features (SQL only)
-ipban: yes
-dynamic_pass_failure_ban: yes
-dynamic_pass_failure_ban_interval: 5
-dynamic_pass_failure_ban_limit: 7
-dynamic_pass_failure_ban_duration: 5
+ipban.enable: yes
+ipban.sql.db_hostname: 127.0.0.1
+ipban.sql.db_port: 3306
+ipban.sql.db_username: ragnarok
+ipban.sql.db_password: ragnarok
+ipban.sql.db_database: ragnarok
+ipban.sql.ipban_table: ipbanlist
+// Dynamic password failure ipban system
+ipban.dynamic_pass_failure_ban: yes
+ipban.dynamic_pass_failure_ban_interval: 5
+ipban.dynamic_pass_failure_ban_limit: 7
+ipban.dynamic_pass_failure_ban_duration: 5
 
 // Interval (in minutes) to execute a DNS/IP update. Disabled by default.
 // Enable it if your server uses a dynamic IP which changes with time.
@@ -126,4 +125,24 @@ dynamic_pass_failure_ban_duration: 5
 use_dnsbl: no
 dnsbl_servers: dnsbl.deltaanime.net
 
+// Which account engine to use.
+// 'auto' selects the first engine available (txt, sql, then others)
+// (defaults to auto)
+account.engine: auto
+
+// Account data storage configuration
+// TXT
+account.txt.account_db: save/account.txt
+account.txt.case_sensitive: no
+// SQL
+account.sql.db_hostname: 127.0.0.1
+account.sql.db_port: 3306
+account.sql.db_username: ragnarok
+account.sql.db_password: ragnarok
+account.sql.db_database: ragnarok
+account.sql.codepage: 
+account.sql.case_sensitive: no
+account.sql.account_db: login
+account.sql.accreg_db: global_reg_value
+
 import: conf/import/login_conf.txt