summaryrefslogtreecommitdiff
path: root/conf/inter-server.conf
diff options
context:
space:
mode:
authorj-tkay <joseph.tk.ea@gmail.com>2013-06-19 11:59:28 +0800
committerj-tkay <joseph.tk.ea@gmail.com>2013-06-19 11:59:28 +0800
commitde7919f0f59f47473e6de709b5d5287a4a55e18d (patch)
tree5967ef231271682ebf9db27185e7e86bbdbc57d4 /conf/inter-server.conf
parent98fe7e4770376ca66590b5a1e75ce3a848d032a9 (diff)
parentbd95eccf047bda9d72abcea0724ad34b31131ab0 (diff)
downloadhercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.gz
hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.bz2
hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.tar.xz
hercules-de7919f0f59f47473e6de709b5d5287a4a55e18d.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'conf/inter-server.conf')
-rw-r--r--conf/inter-server.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/conf/inter-server.conf b/conf/inter-server.conf
index bf8d9e7a3..3cf5211df 100644
--- a/conf/inter-server.conf
+++ b/conf/inter-server.conf
@@ -24,7 +24,7 @@ party_share_level: 15
// and you have localhost, switch it to 127.0.0.1
// Global SQL settings
-// overriden by local settings when the hostname is defined there
+// overridden 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
@@ -74,6 +74,9 @@ mysql_reconnect_count:1
// ALL MySQL Database Table names
+//Shared
+interreg_db: interreg
+
// Char Database Tables
char_db: char
hotkey_db: hotkey