Update config for new code

This config will only work with tmwa v13.9.12 or higher.
If you need an old version, please stay on the 'unsupported' branch.

5 files changed, 105 insertions, 142 deletions

diff --git a/login/conf/ladmin_athena.conf b/login/conf/ladmin_athena.conf
index 2a91a35b..651826c5 100644
--- a/login/conf/ladmin_athena.conf
+++ b/login/conf/ladmin_athena.conf
@@ -1,28 +1,7 @@
 // Athena Ladmin configuration file.
- 
-// Encoding type of the password
-// 0: not encoded
-// 1: key+password
-// 2: password+key
-passenc: 2
 
-// Language of ladmin
-// F: Français
-// E: English (default)
-defaultlanguage: E
-
-// Log Filename. All operations done by the software are logged in this file.
+// Log for all actions.
 ladmin_log_filename: log/ladmin.log
 
-// Indicate how to display date in logs, to players, etc.
-// 0: 31-12-2004 23:59:59
-// 1: 12-31-2004 23:59:59
-// 2: 2004-31-12 23:59:59
-// 3: 2004-12-31 23:59:59 (default)
-date_format: 3
-
-// If you want use an additional configuration file, uncomment and use this parameter
-//import: path/additional_configuration_file
-
 // local settings for this server in this file
 import: conf/ladmin_local.conf
diff --git a/login/conf/ladmin_local.conf.example b/login/conf/ladmin_local.conf.example
index a0706b2b..aaef5fb3 100644
--- a/login/conf/ladmin_local.conf.example
+++ b/login/conf/ladmin_local.conf.example
@@ -1,10 +1,11 @@
 // Athena Ladmin local configuration file.
 
 // Login Server IP
-login_ip:127.0.0.1
+login_ip: 127.0.0.1
 // Login Server Port
 login_port: 6901
 
 // Administrative password, used to connect remotely to server.
-// NOTICE: If you enable remote administration, you should change its value for security
+// NOTICE: You should change its value for security.
+// This is also in login_local.conf
 admin_pass: admin
diff --git a/login/conf/lan_support.conf b/login/conf/lan_support.conf
index 2f49419c..73d5362b 100644
--- a/login/conf/lan_support.conf
+++ b/login/conf/lan_support.conf
@@ -1,4 +1,4 @@
-// Note: this file is used by both the char-server and the login-server
+// Note: used by the login-server; another copy is used by the char-server
 
 // This file is necessary to connect to your server locally:
 // by using it's internal (LAN) IP address, or localhost (127.0.0.1)
@@ -26,33 +26,20 @@
 // on different machines (unless you do some internal port-forwarding)
 
 
-// the IP LAN players should use to connect to the char-server
+// the IP that LAN players should use to connect to the char-server
 lan_char_ip: 127.0.0.1
-// lan_char_ip: 192.168.1.100
-
-// the IP that LAN players should use to connect to the map-server
-lan_map_ip: 127.0.0.1
-// lan_map_ip: 192.168.1.100
+//lan_char_ip: 192.168.1.100
 
 // put here the Subnet mask of your LAN
 // see output of ifconfig (Linux) or ipconfig (Windows)
-subnet: 127.0.0.1
-subnetmask: 255.255.255.255
-// subnetmask: 255.0.0.0
-
+lan_subnet: 127.0.0.1
+//lan_subnet: 127.0.0.1/255.0.0.0
 
 // Common subnets (if you have a subnet that is not one of these,
 // you probably don't need to be reading this)
-
-// subnet: 10.0.0.0
-// subnetmask: 255.0.0.0
-
-// subnet: 172.16.0.0
-// subnetmask: 255.240.0.0
-
-// subnet: 192.168.0.0
-// subnetmask: 255.255.0.0
+//lan_subnet: 10.0.0.0/8
+//lan_subnet: 172.16.0.0/12
+//lan_subnet: 192.168.0.0/16
 
 // Many home routers only use a portion:
-// subnet: 192.168.1.0
-// subnetmask: 255.255.255.0
+//lan_subnet: 192.168.1.0/255.255.255.0
diff --git a/login/conf/login_athena.conf b/login/conf/login_athena.conf
index 6f393c92..7e59d192 100644
--- a/login/conf/login_athena.conf
+++ b/login/conf/login_athena.conf
@@ -1,17 +1,7 @@
 // Athena Login Server configuration file.
-// Translated by Peter Kieser <pfak@telus.net>
- 
-// Level of new GM created with @gm command. (default: 60)
-// If you set to 0, you disable creation of new GM with @gm.
-// To be able to create a gm with @gm, you must:
-// - give a level to this value (not 0)
-// - enable to level 0 the @gm command (atcommand_athena.conf) (default 100)
-// - enable gm commands to normal player (battle_athena.conf, atcommand_gm_only parameter)
-// - and normal player must give correct password when he use the @gm command
-level_new_gm: 60
-
-// Can you make new accounts on the server? (1 for Yes, 0 for no)
-new_account: 1
+
+// Can you make new accounts on the server?
+new_account: yes
 
 // Account flatfile database, stores account information.
 account_filename: save/account.txt
@@ -19,98 +9,89 @@ account_filename: save/account.txt
 // What account AIDs have GM privs, and what level?
 gm_account_filename: save/gm_account.txt
 
-// Timer to check if GM_account file has been changed and reload GM account automaticaly
-// (in seconds; default: 15; value: 0 (disabled), or 2 or more)
+// Time, in seconds, to poll the gm file for changes.
+// Please use ladmin instead of editing the file manually.
 gm_account_filename_check_timer: 15
 
-// Log Filename. All operations received by the server are logged in this file.
+// General log.
 login_log_filename: log/login.log
 
-// Name of the file of that logs the unknown packets (for debug or hack check)
+// Log for unknown packets.
 login_log_unknown_packets_filename: log/login_unknown_packets.log
 
-// Indicate if the unknown packets are saved or not
-//(the unknown packets coming from the char-server or ladministration does not relate to, which is always saved)
-// Be careful: if you receive an attack, your hard disk can cause lag...
-// So, active this option with a speed hard disk or for debug only.
-save_unknown_packets: 0
+// Are unknown packets from the client saved?
+// (unknown internal packets are always saved)
+// This is not nice to your hard drive.
+save_unknown_packets: no
 
-// Indicate if you want display the parse of the packets received in a normal connection
-// It's useful for debug. Possible values: 0: no (default), 1: yes
-display_parse_login: 0
+// Print basic header information about incoming client packets.
+// Also print a little more about client or char auth attempts.
+display_parse_login: no
 
-// Indicate if you want display the parse of the packets received in administration connection
-// It's useful for debug. Possible values: 0: no (default), 1: yes
-display_parse_admin: 0
+// Print basic header information about incoming ladmin packets.
+display_parse_admin: no
 
-// Indicate if you want display the parse of the packets received from a char-server
-// It's useful for debug. Possible values: 0: no (default), 1: yes (without packet 0x2714), 2: all packets
+// Print basic header information about incoming char-server packets.
+// 0: no packets
+// 1: all packets except 0x2714
+// 2: all packets, including 0x2714
 display_parse_fromchar: 0
 
-// Indicate how to display date in logs, to players, etc.
-// 0: 31-12-2004 23:59:59
-// 1: 12-31-2004 23:59:59
-// 2: 2004-31-12 23:59:59
-// 3: 2004-12-31 23:59:59 (default)
-date_format: 3
-
-// Indicate the minimum GM level of player that the server accepts to connection.
-// 0: all players (normal player are 0. it's default), 1-99: GM level at least with level x
+// Accounts must have this GM level to log in.
+// 0: all players, 1-99: GM level at least this.
 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)
+// Behavior of relative time adjustments for unlimited accounts.
+// If true, ladmin timeadd will first set the limit to right now.
+// If false, ladmin timeadd will do nothing on unlimited accounts.
+// In either case, you can use ladmin timeset.
 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)
+// Time, in seconds, that a new account has before it expires.
+// Set to -1 for unlimited time.
+// Use of this setting is not condoned by The Mana World.
 start_limited_time: -1
 
-// It's to check IP of a player between login-server and char-server (part of anti-hacking system)
-// If player doesn't have same IP, connection is refused.
-// Set to 0/off/no to not check IP of player.
-// Set to 1/on/yes if you want to check (default)
-// Note: if you enable this option, be sure that your (local/lan/wan) players use correct ip (in xml file) to contact servers,
-//       and that your LAN is correctly configured (!), and that LAN configuration of eathena is right.
-//       if not correct, you can read list of char-servers, but not look slots of characters (rejected by server).
+// Check that a player has the same IP when switching from login to char.
+// To use this, your lan_support.conf files MUST be correct.
+// Disabling this setting is not supported.
 check_ip_flag: yes
 
-// Specify order of IP control if necessary (option: 'deny,allow', 'allow,deny', or 'mutual-failture')
-// (how to use 'allow' and 'deny' information)
-//order: allow,deny
-
-// Indicate the IP that the server accept.
-// put: 'all', or 'xxx.xxx.' (begin of an ip finished by '.' or a complete ip),
-//      or a network and its mask (example: '123.456.789.012/24' or '123.456.789.012/255.255.255.0')
-//      or 'clear' to suppress previous parameter (use it in import file mainly)
-// Add as many IP's as you wish.
+// How the IP allow/deny lists (below) are interpreted.
+// Possible values:
+//  "deny, allow" (default):
+//      if in deny list, deny
+//      if not in deny list, accept
+//  "allow, deny"
+//      if in allow list, accept
+//      if not in allow list, deny
+//  "mutual-failure"
+//      if in deny list, deny
+//      if not in deny list, if in allow list, allow
+//      if in no list, deny
+// In any case, if both lists are empty, all IPs are allowed.
+// In future, all this will go away: instead the latest setting will apply.
+// NOTE: in any case, it's probably better to use iptables:
+//   - iptables happens before the connection is established
+//   - iptables can be changed without restarting the login-server
+// Note: internally this is called 'access_order'.
+order: deny, allow
+
+// List of IPs (or prefixes or masks) on the allow list.
+// The meaning is determined by the 'order' setting.
+// Note: internally this is called 'access_allow'.
 //allow: all
 
-// Indicate the IP that the server refuse.
-// Add as many IP's as you wish, as long as you put deny: before it.
+// List of IPs (or prefixes or masks) on the deny list.
+// The meaning is determined by the 'order' setting.
+// Note: internally this is called 'access_deny'.
 //deny: 123.123.123.123
 //deny: 234.234.234.234
 
-// If you want use an additional configuration file, uncomment and use this parameter
-//import: path/additional_configuration_file
-
-//Passwords in Login DB are MD5 - <passwordencrypt> cannot b used on client with this on
-use_MD5_passwords: no
-
-//Ban features: read readme for more info if you dont know this.
-ipban: 1
-dynamic_pass_failure_ban: 1
-dynamic_pass_failure_ban_time: 5
-dynamic_pass_failure_ban_how_many: 3
-dynamic_pass_failure_ban_how_long: 60
-dynamic_account_ban: 1
-dynamic_account_ban_class: 0
-
-// Anti-freeze system enable
-anti_freeze_enable: 0
-// Anti-freeze system interval (in seconds)
+// If true, unresponsive char-servers will be kicked.
+anti_freeze_enable: no
+// Interval, in seconds, for one step of the antifreeze timer.
+// Five of these must pass before the kick will happen.
 anti_freeze_interval: 15
 
 // local settings for this server in this file
diff --git a/login/conf/login_local.conf.example b/login/conf/login_local.conf.example
index 37c7713f..3ef8f3b6 100644
--- a/login/conf/login_local.conf.example
+++ b/login/conf/login_local.conf.example
@@ -1,27 +1,42 @@
 // Athena Login Server local configuration file.
- 
-// Port to bind Login Server to (always binds to all IP addresses)
+
+// Port to bind Login Server to (always binds to all IPv4 addresses)
 login_port: 6901
 
-// Whether remote administration is enabled or disabled (1 for enabled, 0 for disabled)
-admin_state: 1
+// Whether remote administration is enabled or disabled
+admin_state: yes
 
-// Administrative password, used by ladmin (perl software) to connect remotely to server.
-// NOTICE: If you enable remote administration, you should change its value for security
+// Administrative password, used by ladmin to connect remotely to server.
+// NOTICE: You should change its value for security.
+// This is also in ladmin_local.conf
 admin_pass: admin
 
-// Indicate the IP that the server accepts for remote administration.
-// put: 'all', or 'xxx.xxx.' (begin of an ip finished by '.' or a complete ip),
-//      or a network and its mask (example: '123.456.789.012/24' or '123.456.789.012/255.255.255.0')
-//      or 'clear' to suppress previous parameter (use it in import file mainly)
-// Add as many IP's as you wish.
-ladminallowip: all
+// List of IPs that the server accepts for remote administration.
+// This can be repeated, with one entry per line.
+// Each line can be an IP prefix (xxx.xxx.), a full IP, or a network/mask.
+// Particularly, it *cannot* be a hostname.
+// The special value 'all' allows all IPs.
+// The special value 'clear' empties the list (useful for includes).
+// Note: internally this is called 'access_ladmin'.
+//ladminallowip: all
+//ladminallowip: clear
+ladminallowip: 127.0.0.1
 
-// Gamemaster password, used with the @gm command to obtain GM commands (level of gm set with level_new_gm parameter).
+// Gamemaster password, used with the @gm command to obtain GM commands
 // NOTICE: You should also change this one.
 gm_pass: gm
 
+// GM level granted to people using @gm (with the correct password).
+// Builtin default is 60; setting it to 0 will disable the command.
+// To work, @gm also needs to be level 0 in atcommand_local.conf,
+// and atcommand_gm_only needs to be off in battle_local.conf
+level_new_gm: 0
+
 // Update host
-// Tells the client that an alternative updatehost is available if the client
-// supports this. If left out nothing will be sent. max length 127.
+// If not empty, send address for client to download data.
+// This must contain news.txt and resources.xml
 update_host: http://updates.themanaworld.org/
+
+// Which world should appear first to the players.
+// see server_name in world/conf/char_local.conf
+main_server: The Mana World