From 73c06082f78f6ba79e40bf66c531d5ff99082fee Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Tue, 19 Aug 2008 15:48:57 +0000 Subject: * Added global sql settings 'sql.*' to inter_athena.conf. * Made account, ipban and loginlog use the global sql settings when the hostname is empty. * Commented 'ipban.sql.*' and 'account.sql.*' so they default to the global settings. * Removed deprecated settings 'case_sensitive' and 'add_to_unlimited_account' from in login_athena.conf. * Made inter_athena.conf be imported from login_athena.conf instead of being handled separate. * Changed ipban to get the failed login attempts of an ip from loginlog (respects if loginlog is enabled or not). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13092 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/inter_athena.conf | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'conf/inter_athena.conf') diff --git a/conf/inter_athena.conf b/conf/inter_athena.conf index 00d3f155f..e7fe1a3bd 100644 --- a/conf/inter_athena.conf +++ b/conf/inter_athena.conf @@ -54,6 +54,16 @@ mapreg_txt: save/mapreg.txt // "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)" // and you have localhost, switch it to 127.0.0.1 +// Global SQL settings +// overriden by local settings when the hostname is defined there +// (currently only the login-server reads/obeys these settings) +sql.db_hostname: 127.0.0.1 +sql.db_port: 3306 +sql.db_username: ragnarok +sql.db_password: ragnarok +sql.db_database: ragnarok +sql.codepage: + // MySQL Character SQL server char_server_ip: 127.0.0.1 char_server_port: 3306 @@ -74,6 +84,7 @@ log_db_port: 3306 log_db_id: ragnarok log_db_pw: ragnarok log_db_db: log +log_codepage: // DO NOT CHANGE ANYTHING BEYOND THIS LINE UNLESS YOU KNOW YOUR DATABASE DAMN WELL // this is meant for people who KNOW their stuff, and for some reason want to change their -- cgit v1.2.3-70-g09d2