diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-08-20 20:30:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-08-20 20:30:58 +0300 |
commit | d16574cc355da13cbb086b955de28165129ee87a (patch) | |
tree | c5d2eb21cc3a29cc8729fd0b150ccdfe29181145 | |
parent | f44f808f0bb6ea87c089bb2582916d305a4b372a (diff) | |
download | evol-tools-d16574cc355da13cbb086b955de28165129ee87a.tar.gz evol-tools-d16574cc355da13cbb086b955de28165129ee87a.tar.bz2 evol-tools-d16574cc355da13cbb086b955de28165129ee87a.tar.xz evol-tools-d16574cc355da13cbb086b955de28165129ee87a.zip |
localserver: add new configurations. and change config version to 2.
-rw-r--r-- | localserver/conf/battle.conf | 32 | ||||
-rw-r--r-- | localserver/conf/battle_conf.txt | 0 | ||||
-rw-r--r-- | localserver/conf/char-server.conf | 31 | ||||
-rw-r--r-- | localserver/conf/char_conf.txt | 8 | ||||
-rw-r--r-- | localserver/conf/inter-server.conf | 32 | ||||
-rw-r--r-- | localserver/conf/inter_conf.txt | 36 | ||||
-rw-r--r-- | localserver/conf/log_conf.txt | 0 | ||||
-rw-r--r-- | localserver/conf/login-server.conf | 32 | ||||
-rw-r--r-- | localserver/conf/login_conf.txt | 2 | ||||
-rw-r--r-- | localserver/conf/logs.conf | 32 | ||||
-rw-r--r-- | localserver/conf/map-server.conf | 32 | ||||
-rw-r--r-- | localserver/conf/map_conf.txt | 5 | ||||
-rw-r--r-- | localserver/conf/packet_conf.txt | 0 | ||||
-rw-r--r-- | localserver/conf/ports.conf | 8 | ||||
-rw-r--r-- | localserver/conf/script.conf | 32 | ||||
-rw-r--r-- | localserver/conf/script_conf.txt | 0 | ||||
-rw-r--r-- | localserver/conf/socket.conf | 32 | ||||
-rw-r--r-- | localserver/conf/sql_connection.conf | 52 | ||||
-rwxr-xr-x | localserver/installconfigs.sh | 2 | ||||
-rwxr-xr-x | localserver/updateconfigs.sh | 6 |
20 files changed, 321 insertions, 53 deletions
diff --git a/localserver/conf/battle.conf b/localserver/conf/battle.conf new file mode 100644 index 0000000..4080eed --- /dev/null +++ b/localserver/conf/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 <http://www.gnu.org/licenses/>. +//========================================================================= +//= Battle local configuration file. +//========================================================================= + +battle_configuration: { + // See conf/map/battle.conf for details +} diff --git a/localserver/conf/battle_conf.txt b/localserver/conf/battle_conf.txt deleted file mode 100644 index e69de29..0000000 --- a/localserver/conf/battle_conf.txt +++ /dev/null diff --git a/localserver/conf/char-server.conf b/localserver/conf/char-server.conf new file mode 100644 index 0000000..f6431c5 --- /dev/null +++ b/localserver/conf/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 <http://www.gnu.org/licenses/>. +//========================================================================= +//= Character Server local configuration file. +//========================================================================= + +min_char_class: 0 +max_char_class: 6 diff --git a/localserver/conf/char_conf.txt b/localserver/conf/char_conf.txt deleted file mode 100644 index d6545a0..0000000 --- a/localserver/conf/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/localserver/conf/inter-server.conf b/localserver/conf/inter-server.conf new file mode 100644 index 0000000..243dda4 --- /dev/null +++ b/localserver/conf/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 <http://www.gnu.org/licenses/>. +//========================================================================= +//= Hercules Inter Server local configuration file. +//========================================================================= + +inter_configuration: { + // See conf/common/inter-server.conf +} diff --git a/localserver/conf/inter_conf.txt b/localserver/conf/inter_conf.txt deleted file mode 100644 index 9200f69..0000000 --- a/localserver/conf/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: 127.0.0.1 -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: 127.0.0.1 -char_server_port: 3306 -char_server_id: evol -char_server_pw: evol -char_server_db: evol - -// MySQL Map SQL Server -map_server_ip: 127.0.0.1 -map_server_port: 3306 -map_server_id: evol -map_server_pw: evol -map_server_db: evol - -// MySQL Log SQL Database -log_db_ip: 127.0.0.1 -log_db_port: 3306 -log_db_id: evol -log_db_pw: evol -log_db_db: evol -log_codepage: diff --git a/localserver/conf/log_conf.txt b/localserver/conf/log_conf.txt deleted file mode 100644 index e69de29..0000000 --- a/localserver/conf/log_conf.txt +++ /dev/null diff --git a/localserver/conf/login-server.conf b/localserver/conf/login-server.conf new file mode 100644 index 0000000..feadef9 --- /dev/null +++ b/localserver/conf/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 <http://www.gnu.org/licenses/>. +//========================================================================= +//= Login Server local configuration file. +//========================================================================= + +login_configuration: { + // See conf/login/login-server.conf for details +} diff --git a/localserver/conf/login_conf.txt b/localserver/conf/login_conf.txt deleted file mode 100644 index 81ea90f..0000000 --- a/localserver/conf/login_conf.txt +++ /dev/null @@ -1,2 +0,0 @@ -// Login Server Port -login_port: 6901 diff --git a/localserver/conf/logs.conf b/localserver/conf/logs.conf new file mode 100644 index 0000000..99e666d --- /dev/null +++ b/localserver/conf/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 <http://www.gnu.org/licenses/>. +//========================================================================= +//= Hercules Log local configuration file. +//========================================================================= + +map_log: { + // See conf/map/logs.conf for details +} diff --git a/localserver/conf/map-server.conf b/localserver/conf/map-server.conf new file mode 100644 index 0000000..2c9b165 --- /dev/null +++ b/localserver/conf/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 <http://www.gnu.org/licenses/>. +//========================================================================= +//= Map Server local configuration file. +//========================================================================= + +map_configuration: { + // See conf/map/map-server.conf for details +} diff --git a/localserver/conf/map_conf.txt b/localserver/conf/map_conf.txt deleted file mode 100644 index cc912e2..0000000 --- a/localserver/conf/map_conf.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map Server Port -map_port: 5122 - -// Character Server Port -char_port: 6122 diff --git a/localserver/conf/packet_conf.txt b/localserver/conf/packet_conf.txt deleted file mode 100644 index e69de29..0000000 --- a/localserver/conf/packet_conf.txt +++ /dev/null diff --git a/localserver/conf/ports.conf b/localserver/conf/ports.conf new file mode 100644 index 0000000..7d5481e --- /dev/null +++ b/localserver/conf/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/localserver/conf/script.conf b/localserver/conf/script.conf new file mode 100644 index 0000000..b354b2b --- /dev/null +++ b/localserver/conf/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 <http://www.gnu.org/licenses/>. +//========================================================================= +//= Hercules Script local configuration file. +//========================================================================= + +script_configuration: { + // See conf/map/script.conf for details +} diff --git a/localserver/conf/script_conf.txt b/localserver/conf/script_conf.txt deleted file mode 100644 index e69de29..0000000 --- a/localserver/conf/script_conf.txt +++ /dev/null diff --git a/localserver/conf/socket.conf b/localserver/conf/socket.conf new file mode 100644 index 0000000..04d0a40 --- /dev/null +++ b/localserver/conf/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 <http://www.gnu.org/licenses/>. +//========================================================================= +//= Hercules Sockets local configuration file +//========================================================================= + +socket_configuration: { + // See conf/common/socket.conf for details. +} diff --git a/localserver/conf/sql_connection.conf b/localserver/conf/sql_connection.conf new file mode 100644 index 0000000..1f9f514 --- /dev/null +++ b/localserver/conf/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 <http://www.gnu.org/licenses/>. +//========================================================================= +//= 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: "127.0.0.1" + db_port: 3306 + db_username: "evol" + db_password: "evol" + db_database: "evol" + //codepage:"" +} diff --git a/localserver/installconfigs.sh b/localserver/installconfigs.sh index 4957abd..5f8c7fa 100755 --- a/localserver/installconfigs.sh +++ b/localserver/installconfigs.sh @@ -4,7 +4,7 @@ export SD="../../server-data" export CONF="$SD/conf/import" mkdir $CONF -cp conf/*.txt $CONF +cp conf/* $CONF cp -f conf/inter_conf.txt $CONF cp -f ${SD}/conf/channels.conf.base ${SD}/conf/channels.conf mkdir versions diff --git a/localserver/updateconfigs.sh b/localserver/updateconfigs.sh index a6f8a73..29e063d 100755 --- a/localserver/updateconfigs.sh +++ b/localserver/updateconfigs.sh @@ -11,5 +11,9 @@ fi if [ "${VER}" -lt "1" ]; then cp -f ${CONFDIR}/conf/channels.conf ${CONFDIR}/conf/channels.conf.bak cp -f ${CONFDIR}/conf/channels.conf.base ${CONFDIR}/conf/channels.conf - echo "1" >versions/confver fi + +if [ "${VER}" -lt "2" ]; then + cp conf/* ${CONFDIR}/conf/import + echo "2" >versions/confver +fi
\ No newline at end of file |