From cf88350d62b5bbf1c0c2150596e7f2fdc88307c4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 20 Aug 2016 20:26:27 +0300 Subject: Update configuration for ci scripts. --- .tools/conf/mariadb/battle.conf | 32 ++++++++++++++++++++ .tools/conf/mariadb/battle_conf.txt | 0 .tools/conf/mariadb/char-server.conf | 31 ++++++++++++++++++++ .tools/conf/mariadb/char_conf.txt | 8 ----- .tools/conf/mariadb/inter-server.conf | 32 ++++++++++++++++++++ .tools/conf/mariadb/inter_conf.txt | 36 ----------------------- .tools/conf/mariadb/log_conf.txt | 0 .tools/conf/mariadb/login-server.conf | 32 ++++++++++++++++++++ .tools/conf/mariadb/login_conf.txt | 2 -- .tools/conf/mariadb/logs.conf | 32 ++++++++++++++++++++ .tools/conf/mariadb/map-server.conf | 32 ++++++++++++++++++++ .tools/conf/mariadb/map_conf.txt | 5 ---- .tools/conf/mariadb/packet_conf.txt | 0 .tools/conf/mariadb/ports.conf | 8 +++++ .tools/conf/mariadb/script.conf | 32 ++++++++++++++++++++ .tools/conf/mariadb/script_conf.txt | 0 .tools/conf/mariadb/socket.conf | 32 ++++++++++++++++++++ .tools/conf/mariadb/sql_connection.conf | 52 +++++++++++++++++++++++++++++++++ .tools/conf/mysql/battle.conf | 32 ++++++++++++++++++++ .tools/conf/mysql/battle_conf.txt | 0 .tools/conf/mysql/char-server.conf | 31 ++++++++++++++++++++ .tools/conf/mysql/char_conf.txt | 8 ----- .tools/conf/mysql/inter-server.conf | 32 ++++++++++++++++++++ .tools/conf/mysql/inter_conf.txt | 36 ----------------------- .tools/conf/mysql/log_conf.txt | 0 .tools/conf/mysql/login-server.conf | 32 ++++++++++++++++++++ .tools/conf/mysql/login_conf.txt | 2 -- .tools/conf/mysql/logs.conf | 32 ++++++++++++++++++++ .tools/conf/mysql/map-server.conf | 32 ++++++++++++++++++++ .tools/conf/mysql/map_conf.txt | 5 ---- .tools/conf/mysql/packet_conf.txt | 0 .tools/conf/mysql/ports.conf | 8 +++++ .tools/conf/mysql/script.conf | 32 ++++++++++++++++++++ .tools/conf/mysql/script_conf.txt | 0 .tools/conf/mysql/socket.conf | 32 ++++++++++++++++++++ .tools/conf/mysql/sql_connection.conf | 52 +++++++++++++++++++++++++++++++++ 36 files changed, 630 insertions(+), 102 deletions(-) create mode 100644 .tools/conf/mariadb/battle.conf delete mode 100644 .tools/conf/mariadb/battle_conf.txt create mode 100644 .tools/conf/mariadb/char-server.conf delete mode 100644 .tools/conf/mariadb/char_conf.txt create mode 100644 .tools/conf/mariadb/inter-server.conf delete mode 100644 .tools/conf/mariadb/inter_conf.txt delete mode 100644 .tools/conf/mariadb/log_conf.txt create mode 100644 .tools/conf/mariadb/login-server.conf delete mode 100644 .tools/conf/mariadb/login_conf.txt create mode 100644 .tools/conf/mariadb/logs.conf create mode 100644 .tools/conf/mariadb/map-server.conf delete mode 100644 .tools/conf/mariadb/map_conf.txt delete mode 100644 .tools/conf/mariadb/packet_conf.txt create mode 100644 .tools/conf/mariadb/ports.conf create mode 100644 .tools/conf/mariadb/script.conf delete mode 100644 .tools/conf/mariadb/script_conf.txt create mode 100644 .tools/conf/mariadb/socket.conf create mode 100644 .tools/conf/mariadb/sql_connection.conf create mode 100644 .tools/conf/mysql/battle.conf delete mode 100644 .tools/conf/mysql/battle_conf.txt create mode 100644 .tools/conf/mysql/char-server.conf delete mode 100644 .tools/conf/mysql/char_conf.txt create mode 100644 .tools/conf/mysql/inter-server.conf delete mode 100644 .tools/conf/mysql/inter_conf.txt delete mode 100644 .tools/conf/mysql/log_conf.txt create mode 100644 .tools/conf/mysql/login-server.conf delete mode 100644 .tools/conf/mysql/login_conf.txt create mode 100644 .tools/conf/mysql/logs.conf create mode 100644 .tools/conf/mysql/map-server.conf delete mode 100644 .tools/conf/mysql/map_conf.txt delete mode 100644 .tools/conf/mysql/packet_conf.txt create mode 100644 .tools/conf/mysql/ports.conf create mode 100644 .tools/conf/mysql/script.conf delete mode 100644 .tools/conf/mysql/script_conf.txt create mode 100644 .tools/conf/mysql/socket.conf create mode 100644 .tools/conf/mysql/sql_connection.conf diff --git a/.tools/conf/mariadb/battle.conf b/.tools/conf/mariadb/battle.conf new file mode 100644 index 00000000..4080eed7 --- /dev/null +++ b/.tools/conf/mariadb/battle.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Battle local configuration file. +//========================================================================= + +battle_configuration: { + // See conf/map/battle.conf for details +} diff --git a/.tools/conf/mariadb/battle_conf.txt b/.tools/conf/mariadb/battle_conf.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/.tools/conf/mariadb/char-server.conf b/.tools/conf/mariadb/char-server.conf new file mode 100644 index 00000000..f6431c5b --- /dev/null +++ b/.tools/conf/mariadb/char-server.conf @@ -0,0 +1,31 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Character Server local configuration file. +//========================================================================= + +min_char_class: 0 +max_char_class: 6 diff --git a/.tools/conf/mariadb/char_conf.txt b/.tools/conf/mariadb/char_conf.txt deleted file mode 100644 index d6545a04..00000000 --- a/.tools/conf/mariadb/char_conf.txt +++ /dev/null @@ -1,8 +0,0 @@ -min_char_class: 0 -max_char_class: 6 - -// Login Server Port -login_port: 6901 - -// Character Server Port -char_port: 6122 diff --git a/.tools/conf/mariadb/inter-server.conf b/.tools/conf/mariadb/inter-server.conf new file mode 100644 index 00000000..243dda4e --- /dev/null +++ b/.tools/conf/mariadb/inter-server.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Hercules Inter Server local configuration file. +//========================================================================= + +inter_configuration: { + // See conf/common/inter-server.conf +} diff --git a/.tools/conf/mariadb/inter_conf.txt b/.tools/conf/mariadb/inter_conf.txt deleted file mode 100644 index 08234300..00000000 --- a/.tools/conf/mariadb/inter_conf.txt +++ /dev/null @@ -1,36 +0,0 @@ -// For IPs, ideally under linux, you want to use localhost instead of 127.0.0.1 -// Under windows, you want to use 127.0.0.1. If you see a message like -// "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 -// overridden by local settings when the hostname is defined there -// (currently only the login-server reads/obeys these settings) -sql.db_hostname: mariadb -sql.db_port: 3306 -sql.db_username: evol -sql.db_password: evol -sql.db_database: evol -sql.codepage: - -// MySQL Character SQL server -char_server_ip: mariadb -char_server_port: 3306 -char_server_id: evol -char_server_pw: evol -char_server_db: evol - -// MySQL Map SQL Server -map_server_ip: mariadb -map_server_port: 3306 -map_server_id: evol -map_server_pw: evol -map_server_db: evol - -// MySQL Log SQL Database -log_db_ip: mariadb -log_db_port: 3306 -log_db_id: evol -log_db_pw: evol -log_db_db: evol -log_codepage: diff --git a/.tools/conf/mariadb/log_conf.txt b/.tools/conf/mariadb/log_conf.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/.tools/conf/mariadb/login-server.conf b/.tools/conf/mariadb/login-server.conf new file mode 100644 index 00000000..feadef97 --- /dev/null +++ b/.tools/conf/mariadb/login-server.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Login Server local configuration file. +//========================================================================= + +login_configuration: { + // See conf/login/login-server.conf for details +} diff --git a/.tools/conf/mariadb/login_conf.txt b/.tools/conf/mariadb/login_conf.txt deleted file mode 100644 index 81ea90f4..00000000 --- a/.tools/conf/mariadb/login_conf.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Login Server Port -login_port: 6901 diff --git a/.tools/conf/mariadb/logs.conf b/.tools/conf/mariadb/logs.conf new file mode 100644 index 00000000..99e666d9 --- /dev/null +++ b/.tools/conf/mariadb/logs.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Hercules Log local configuration file. +//========================================================================= + +map_log: { + // See conf/map/logs.conf for details +} diff --git a/.tools/conf/mariadb/map-server.conf b/.tools/conf/mariadb/map-server.conf new file mode 100644 index 00000000..2c9b1653 --- /dev/null +++ b/.tools/conf/mariadb/map-server.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Map Server local configuration file. +//========================================================================= + +map_configuration: { + // See conf/map/map-server.conf for details +} diff --git a/.tools/conf/mariadb/map_conf.txt b/.tools/conf/mariadb/map_conf.txt deleted file mode 100644 index cc912e2b..00000000 --- a/.tools/conf/mariadb/map_conf.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map Server Port -map_port: 5122 - -// Character Server Port -char_port: 6122 diff --git a/.tools/conf/mariadb/packet_conf.txt b/.tools/conf/mariadb/packet_conf.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/.tools/conf/mariadb/ports.conf b/.tools/conf/mariadb/ports.conf new file mode 100644 index 00000000..7d5481e3 --- /dev/null +++ b/.tools/conf/mariadb/ports.conf @@ -0,0 +1,8 @@ +// Login server port +login_port: 6901 + +// Character server port +char_port: 6122 + +// Map server port +map_port: 5122 diff --git a/.tools/conf/mariadb/script.conf b/.tools/conf/mariadb/script.conf new file mode 100644 index 00000000..b354b2bf --- /dev/null +++ b/.tools/conf/mariadb/script.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Hercules Script local configuration file. +//========================================================================= + +script_configuration: { + // See conf/map/script.conf for details +} diff --git a/.tools/conf/mariadb/script_conf.txt b/.tools/conf/mariadb/script_conf.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/.tools/conf/mariadb/socket.conf b/.tools/conf/mariadb/socket.conf new file mode 100644 index 00000000..04d0a40c --- /dev/null +++ b/.tools/conf/mariadb/socket.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Hercules Sockets local configuration file +//========================================================================= + +socket_configuration: { + // See conf/common/socket.conf for details. +} diff --git a/.tools/conf/mariadb/sql_connection.conf b/.tools/conf/mariadb/sql_connection.conf new file mode 100644 index 00000000..1e0e559f --- /dev/null +++ b/.tools/conf/mariadb/sql_connection.conf @@ -0,0 +1,52 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= SQL connection configuration file. +//========================================================================= +// This file affects how ALL server sql connections work, unless explictly +// defined so in the server configuration file (See +// doc/global_configuration.txt for more information). +//========================================================================= + +sql_connection: { + // [INTER] You can specify the codepage to use in your mySQL tables here. + // (Note that this feature requires MySQL 4.1+) + //default_codepage: "" + + // [LOGIN] Is `userid` in account_db case sensitive? + //case_sensitive: false + + // For IPs, ideally under linux, you want to use localhost instead of 127.0.0.1. + // Under windows, you want to use 127.0.0.1. If you see a message like + // "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)" + // and you have localhost, switch it to 127.0.0.1 + db_hostname: "mariadb" + db_port: 3306 + db_username: "evol" + db_password: "evol" + db_database: "evol" + //codepage:"" +} diff --git a/.tools/conf/mysql/battle.conf b/.tools/conf/mysql/battle.conf new file mode 100644 index 00000000..4080eed7 --- /dev/null +++ b/.tools/conf/mysql/battle.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Battle local configuration file. +//========================================================================= + +battle_configuration: { + // See conf/map/battle.conf for details +} diff --git a/.tools/conf/mysql/battle_conf.txt b/.tools/conf/mysql/battle_conf.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/.tools/conf/mysql/char-server.conf b/.tools/conf/mysql/char-server.conf new file mode 100644 index 00000000..f6431c5b --- /dev/null +++ b/.tools/conf/mysql/char-server.conf @@ -0,0 +1,31 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Character Server local configuration file. +//========================================================================= + +min_char_class: 0 +max_char_class: 6 diff --git a/.tools/conf/mysql/char_conf.txt b/.tools/conf/mysql/char_conf.txt deleted file mode 100644 index d6545a04..00000000 --- a/.tools/conf/mysql/char_conf.txt +++ /dev/null @@ -1,8 +0,0 @@ -min_char_class: 0 -max_char_class: 6 - -// Login Server Port -login_port: 6901 - -// Character Server Port -char_port: 6122 diff --git a/.tools/conf/mysql/inter-server.conf b/.tools/conf/mysql/inter-server.conf new file mode 100644 index 00000000..243dda4e --- /dev/null +++ b/.tools/conf/mysql/inter-server.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Hercules Inter Server local configuration file. +//========================================================================= + +inter_configuration: { + // See conf/common/inter-server.conf +} diff --git a/.tools/conf/mysql/inter_conf.txt b/.tools/conf/mysql/inter_conf.txt deleted file mode 100644 index 0f4307af..00000000 --- a/.tools/conf/mysql/inter_conf.txt +++ /dev/null @@ -1,36 +0,0 @@ -// For IPs, ideally under linux, you want to use localhost instead of 127.0.0.1 -// Under windows, you want to use 127.0.0.1. If you see a message like -// "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 -// overridden by local settings when the hostname is defined there -// (currently only the login-server reads/obeys these settings) -sql.db_hostname: mysql -sql.db_port: 3306 -sql.db_username: evol -sql.db_password: evol -sql.db_database: evol -sql.codepage: - -// MySQL Character SQL server -char_server_ip: mysql -char_server_port: 3306 -char_server_id: evol -char_server_pw: evol -char_server_db: evol - -// MySQL Map SQL Server -map_server_ip: mysql -map_server_port: 3306 -map_server_id: evol -map_server_pw: evol -map_server_db: evol - -// MySQL Log SQL Database -log_db_ip: mysql -log_db_port: 3306 -log_db_id: evol -log_db_pw: evol -log_db_db: evol -log_codepage: diff --git a/.tools/conf/mysql/log_conf.txt b/.tools/conf/mysql/log_conf.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/.tools/conf/mysql/login-server.conf b/.tools/conf/mysql/login-server.conf new file mode 100644 index 00000000..feadef97 --- /dev/null +++ b/.tools/conf/mysql/login-server.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Login Server local configuration file. +//========================================================================= + +login_configuration: { + // See conf/login/login-server.conf for details +} diff --git a/.tools/conf/mysql/login_conf.txt b/.tools/conf/mysql/login_conf.txt deleted file mode 100644 index 81ea90f4..00000000 --- a/.tools/conf/mysql/login_conf.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Login Server Port -login_port: 6901 diff --git a/.tools/conf/mysql/logs.conf b/.tools/conf/mysql/logs.conf new file mode 100644 index 00000000..99e666d9 --- /dev/null +++ b/.tools/conf/mysql/logs.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Hercules Log local configuration file. +//========================================================================= + +map_log: { + // See conf/map/logs.conf for details +} diff --git a/.tools/conf/mysql/map-server.conf b/.tools/conf/mysql/map-server.conf new file mode 100644 index 00000000..2c9b1653 --- /dev/null +++ b/.tools/conf/mysql/map-server.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Map Server local configuration file. +//========================================================================= + +map_configuration: { + // See conf/map/map-server.conf for details +} diff --git a/.tools/conf/mysql/map_conf.txt b/.tools/conf/mysql/map_conf.txt deleted file mode 100644 index cc912e2b..00000000 --- a/.tools/conf/mysql/map_conf.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map Server Port -map_port: 5122 - -// Character Server Port -char_port: 6122 diff --git a/.tools/conf/mysql/packet_conf.txt b/.tools/conf/mysql/packet_conf.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/.tools/conf/mysql/ports.conf b/.tools/conf/mysql/ports.conf new file mode 100644 index 00000000..7d5481e3 --- /dev/null +++ b/.tools/conf/mysql/ports.conf @@ -0,0 +1,8 @@ +// Login server port +login_port: 6901 + +// Character server port +char_port: 6122 + +// Map server port +map_port: 5122 diff --git a/.tools/conf/mysql/script.conf b/.tools/conf/mysql/script.conf new file mode 100644 index 00000000..b354b2bf --- /dev/null +++ b/.tools/conf/mysql/script.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Hercules Script local configuration file. +//========================================================================= + +script_configuration: { + // See conf/map/script.conf for details +} diff --git a/.tools/conf/mysql/script_conf.txt b/.tools/conf/mysql/script_conf.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/.tools/conf/mysql/socket.conf b/.tools/conf/mysql/socket.conf new file mode 100644 index 00000000..04d0a40c --- /dev/null +++ b/.tools/conf/mysql/socket.conf @@ -0,0 +1,32 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= Hercules Sockets local configuration file +//========================================================================= + +socket_configuration: { + // See conf/common/socket.conf for details. +} diff --git a/.tools/conf/mysql/sql_connection.conf b/.tools/conf/mysql/sql_connection.conf new file mode 100644 index 00000000..b469dbf0 --- /dev/null +++ b/.tools/conf/mysql/sql_connection.conf @@ -0,0 +1,52 @@ +//================= Hercules Configuration ================================ +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2014-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see . +//========================================================================= +//= SQL connection configuration file. +//========================================================================= +// This file affects how ALL server sql connections work, unless explictly +// defined so in the server configuration file (See +// doc/global_configuration.txt for more information). +//========================================================================= + +sql_connection: { + // [INTER] You can specify the codepage to use in your mySQL tables here. + // (Note that this feature requires MySQL 4.1+) + //default_codepage: "" + + // [LOGIN] Is `userid` in account_db case sensitive? + //case_sensitive: false + + // For IPs, ideally under linux, you want to use localhost instead of 127.0.0.1. + // Under windows, you want to use 127.0.0.1. If you see a message like + // "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)" + // and you have localhost, switch it to 127.0.0.1 + db_hostname: "mysql" + db_port: 3306 + db_username: "evol" + db_password: "evol" + db_database: "evol" + //codepage:"" +} -- cgit v1.2.3-70-g09d2