summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/Changelog.txt2
-rw-r--r--conf/inter_athena.conf7
2 files changed, 2 insertions, 7 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 457952988..91fe76ce7 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -4,6 +4,8 @@ Date Added
* Rev. 11551 Fixed nopenalty entries for Turbo Track maps. [L0ne_W0lf]
* Rev. 11546 Added Turbo Track map flags. [L0ne_W0lf]
* Removed the mail_server_enable setting as it's not required. [Zephyrus]
+ * Removed the mail_server database settings from interconf.
+ Now maildb is an integral part of the mainDB. [Zephyrus]
2007/10/13
* Renamed the config default_skill_delay to default_walk_delay as that is
the only thing it does now.
diff --git a/conf/inter_athena.conf b/conf/inter_athena.conf
index 904a56433..e489370ee 100644
--- a/conf/inter_athena.conf
+++ b/conf/inter_athena.conf
@@ -85,13 +85,6 @@ log_db_id: ragnarok
log_db_pw: ragnarok
log_db: log
-// MySQL Mail SQL Server
-mail_server_ip: 127.0.0.1
-mail_server_port: 3306
-mail_server_id: ragnarok
-mail_server_pw: ragnarok
-mail_server_db: ragnarok
-
// for TXT -> SQL convertors
db_server_ip: 127.0.0.1
db_server_port: 3306