summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-27 12:40:29 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-27 12:40:29 +0000
commit807577cbc6c8e93e99ab4140789babaae10be279 (patch)
tree238efb9c21709092c71ab6a9fbf6c8a36126102d /conf
parentecbb7655309ca4cda4b4cf2b92e1c52e250505e2 (diff)
downloadhercules-807577cbc6c8e93e99ab4140789babaae10be279.tar.gz
hercules-807577cbc6c8e93e99ab4140789babaae10be279.tar.bz2
hercules-807577cbc6c8e93e99ab4140789babaae10be279.tar.xz
hercules-807577cbc6c8e93e99ab4140789babaae10be279.zip
Cleaned up several poorly chosen loginlog variable names.
Removed the unused login and txt->sql options in inter_athena.conf. Renamed config option log_db to log_db_db in inter_athena.conf. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13005 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
-rw-r--r--conf/Changelog.txt2
-rw-r--r--conf/inter_athena.conf16
2 files changed, 3 insertions, 15 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index d5371167f..353e9ceb3 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,6 +1,8 @@
Date Added
2008/07/27
+ * Removed the unused login and txt->sql options in inter_athena.conf
+ * Renamed config option log_db to log_db_db in inter_athena.conf
* Conf file adjustments for the loginmerge branch
- added new login and ipban db config options to login_athena.conf
- login database options are no longer in inter_athena.conf!
diff --git a/conf/inter_athena.conf b/conf/inter_athena.conf
index ddb7c5e1b..8fa68a3ca 100644
--- a/conf/inter_athena.conf
+++ b/conf/inter_athena.conf
@@ -51,13 +51,6 @@ scdata_txt: save/scdata.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
-// MySQL Login SQL Server
-login_server_ip: 127.0.0.1
-login_server_port: 3306
-login_server_id: ragnarok
-login_server_pw: ragnarok
-login_server_db: ragnarok
-
// MySQL Character SQL server
char_server_ip: 127.0.0.1
char_server_port: 3306
@@ -77,14 +70,7 @@ log_db_ip: 127.0.0.1
log_db_port: 3306
log_db_id: ragnarok
log_db_pw: ragnarok
-log_db: log
-
-// for TXT -> SQL convertors
-db_server_ip: 127.0.0.1
-db_server_port: 3306
-db_server_id: ragnarok
-db_server_pw: ragnarok
-db_server_logindb: ragnarok
+log_db_db: log
// 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