From 8b3d393e7755c167eebe4d9f7fc786074f12e9af Mon Sep 17 00:00:00 2001 From: Darkelarious Date: Sun, 8 Nov 2015 15:42:27 +0100 Subject: Full support for Postgres, MySQL and SQLite3 + minor bug fixes --- data/masterserver-config.pl | 51 ++++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 31 deletions(-) (limited to 'data/masterserver-config.pl') diff --git a/data/masterserver-config.pl b/data/masterserver-config.pl index e8fe418..d5d6091 100755 --- a/data/masterserver-config.pl +++ b/data/masterserver-config.pl @@ -1,11 +1,10 @@ package MasterServer; our (%S, $ROOT); our %S = ( - ################################################################################ # Masterserver HOST information # # # -# Please fill in your contact details here, for two-way synchronization and # +# Please fill in YOUR contact details here, for two-way synchronization and # # for your users to be able to contact you. # # # # Values may not contain backslashes and quotes: no \ or \\, nor ' and ", # @@ -16,7 +15,7 @@ our %S = ( # example: 333networks -- http://master.333networks.com -- info@333networks.com contact_details => '333networks -- http://master.333networks.com -- info@333networks.com', - # host address + # host address, shows when using sync-options masterserver_address => 'master.333networks.com', ################################################################################ @@ -24,18 +23,18 @@ our %S = ( # # # Login credentials for the database that was created manually before. # # Yes, that means that you need to create the database and tables on your own. # -# Use only one option: Postgresql, SQLite (or future: MySQL) # +# Use only one option: Postgresql, SQLite or MySQL # # # ################################################################################ # Postgresql - dblogin => ['dbi:Pg:dbname=database_name', 'username', 'password'], + #dblogin => ['dbi:Pg:dbname=databasename', 'user', 'password'], # SQLite - #dblogin => ["dbi:SQLite:dbname=$ROOT/data/database_name.db",'',''], + #dblogin => ["dbi:SQLite:dbname=$ROOT/data/databasename.db",'',''], # MySQL - #dblogin => ["dbi:mysql:database=database_name;host=localhost;port=3306",'user','password'], + dblogin => ["dbi:mysql:database=databasename;host=localhost;port=3306",'user','password'], ################################################################################ # Logging configuration # @@ -58,7 +57,7 @@ our %S = ( suppress => "none", # show all entries # suppress the most annoying messages - #suppress => "add update delete read tcp udp query secure hostname", + # suppress => "add update delete read tcp udp secure query beacon hostname", # print database errors db_print => 0, @@ -103,30 +102,20 @@ our %S = ( # Wait 60+ seconds before starting timers for incoming beacons # # # ################################################################################ - - # Query UCC-based applets - master_applet_enabled => 1, - master_applet_time => [90, 1200], # Synchronization with other 333networks-based masterservers sync_enabled => 1, # 0 = disabled - sync_time => [180, 1200], + sync_time => [60, 900], + + # Query UCC-based applets + master_applet_enabled => 1, # 0 = disabled + master_applet_time => [90, 900], # Beacon Checker query all addresses in the database, requesting "basic" and # "info". Execute at least twice per hour, to avoid time-outs in own data. # disabling breaks support for certain games [citation needed]. beacon_checker_enabled => 1, - beacon_checker_time => [60, 0.5, 1800], - - # Collect server information for the 333networks main site. Identical - # mechanism as the Beacon Checker. Disable when not interested in UT info - # for your website. - # NB: with some work it can be adapted to work with any other game. Own risk. - utserver_query_enabled => 1, - utserver_query_time => [75, 0.15, 240], - - # Maintenance duties like cleaning out old servers/players - maintenance_time => [3600, 300], + beacon_checker_time => [120, 0.5, 1800], ################################################################################ # Synchronization settings # @@ -136,7 +125,7 @@ our %S = ( # # ################################################################################ - # additional masters to sync with (in addition to db-entries) + # masters to sync with sync_masters => [ { address => "master.333networks.com", port => 28900 }, # default { address => "master.noccer.de", port => 28900 }, @@ -144,10 +133,10 @@ our %S = ( { address => "master.errorist.tk", port => 28900 }, ], - # sync all or selected games? + # sync all or only selected games? # 0 = all, 1 + gamenames = selected + #sync_games => [1, "ut unreal"], # example with only UT/Unreal syncing sync_games => [0], - #sync_games => [1, "ut unreal"], ################################################################################ # Query UCC Applets # @@ -160,19 +149,19 @@ our %S = ( # remote applets to be queried master_applet => [ {ip => "utmaster.epicgames.com", port => 28900, game => "ut"}, - {ip => "master.hypercoop.tk", port => 28900, game => "unreal"}, {ip => "master.newbiesplayground.net", port => 28900, game => "unreal"}, {ip => "master.hlkclan.net", port => 28900, game => "unreal"}, ], -); #end %S +); #end %S config + ################################################################################ # # # Supported Games. # # # -# List of games that are supported by the 333networks masterserver. Note that # -# adding a game does not necessarily mean that suddenly the protocol will # +# List of games of which 333networks has the authentication ciphers. Note that # +# adding a game here does not necessarily mean that suddenly the protocol will # # be supported. # # # ################################################################################ -- cgit v1.2.3