diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/Changelog.txt | 5 | ||||
| -rw-r--r-- | conf/inter_athena.conf | 11 | ||||
| -rw-r--r-- | conf/login_athena.conf | 41 |
3 files changed, 33 insertions, 24 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt index ebcf65639..55d8143d0 100644 --- a/conf/Changelog.txt +++ b/conf/Changelog.txt @@ -1,5 +1,10 @@ Date Added +2008/08/19 + * Added global sql settings 'sql.*' to inter_athena.conf. + * Commented 'ipban.sql.*' and 'account.sql.*' so they default to the global settings. + * Removed deprecated settings 'case_sensitive' and 'add_to_unlimited_account' from in login_athena.conf. + * Made inter_athena.conf be imported from login_athena.conf. [FlavioJS] 2008/08/13 * Added config settings mapreg_txt and mapreg_db to inter config [ultramage] 2008/08/10 diff --git a/conf/inter_athena.conf b/conf/inter_athena.conf index 00d3f155f..e7fe1a3bd 100644 --- a/conf/inter_athena.conf +++ b/conf/inter_athena.conf @@ -54,6 +54,16 @@ mapreg_txt: save/mapreg.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 +// Global SQL settings +// overriden 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: ragnarok +sql.db_password: ragnarok +sql.db_database: ragnarok +sql.codepage: + // MySQL Character SQL server char_server_ip: 127.0.0.1 char_server_port: 3306 @@ -74,6 +84,7 @@ log_db_port: 3306 log_db_id: ragnarok log_db_pw: ragnarok log_db_db: log +log_codepage: // 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 diff --git a/conf/login_athena.conf b/conf/login_athena.conf index 28f022c42..6026b7670 100644 --- a/conf/login_athena.conf +++ b/conf/login_athena.conf @@ -50,9 +50,6 @@ admin_allowed_host: 127.0.0.1 // This prevents usage of >& log.file console: off -// Are logins case sensitive? (SQL only) -case_sensitive: yes - // Can you use _M/_F to make new accounts on the server? new_account: yes @@ -81,11 +78,6 @@ date_format: %Y-%m-%d %H:%M:%S // 0: all players (normal player are 0. it's default), 1-99: GM level at least with level x min_level_to_connect: 0 -// Give possibility to adjust (ladmin command: timeadd) the time of an unlimited account. -// If set to on/1/yes..., the adjustment is be done from actual time to set the final time of the account. -// If set to no/0/no..., the adjustment can not be done on an unlimited account. You must set (ladmin command: timeset) a final time before to adjust (ladmin command: timeadd) -add_to_unlimited_account: off - // Starting additional sec from now for the limited time at creation of account // -1: new account are created with UNlimited time (default value) // 0 or more: new accounts was created by addition of the value (in sec) to the actual time (to set first limited time) @@ -103,12 +95,12 @@ use_MD5_passwords: no // Ipban features (SQL only) ipban.enable: yes -ipban.sql.db_hostname: 127.0.0.1 -ipban.sql.db_port: 3306 -ipban.sql.db_username: ragnarok -ipban.sql.db_password: ragnarok -ipban.sql.db_database: ragnarok -ipban.sql.ipban_table: ipbanlist +//ipban.sql.db_hostname: 127.0.0.1 +//ipban.sql.db_port: 3306 +//ipban.sql.db_username: ragnarok +//ipban.sql.db_password: ragnarok +//ipban.sql.db_database: ragnarok +//ipban.sql.ipban_table: ipbanlist // Dynamic password failure ipban system ipban.dynamic_pass_failure_ban: yes ipban.dynamic_pass_failure_ban_interval: 5 @@ -135,14 +127,15 @@ account.engine: auto account.txt.account_db: save/account.txt account.txt.case_sensitive: no // SQL -account.sql.db_hostname: 127.0.0.1 -account.sql.db_port: 3306 -account.sql.db_username: ragnarok -account.sql.db_password: ragnarok -account.sql.db_database: ragnarok -account.sql.codepage: -account.sql.case_sensitive: no -account.sql.account_db: login -account.sql.accreg_db: global_reg_value - +//account.sql.db_hostname: 127.0.0.1 +//account.sql.db_port: 3306 +//account.sql.db_username: ragnarok +//account.sql.db_password: ragnarok +//account.sql.db_database: ragnarok +//account.sql.codepage: +//account.sql.case_sensitive: no +//account.sql.account_db: login +//account.sql.accreg_db: global_reg_value + +import: conf/inter_athena.conf import: conf/import/login_conf.txt |