diff --git a/code/ryzom/server/admin_executor_service.cfg b/code/ryzom/server/admin_executor_service.cfg index 0c54246a2..fdf3d6dca 100644 --- a/code/ryzom/server/admin_executor_service.cfg +++ b/code/ryzom/server/admin_executor_service.cfg @@ -1,57 +1,16 @@ -#include "admin_executor_service_default.cfg" - -// I'm the AES, I'll not connect to myself! -DontUseAES = 1; -// I don't need a connection to a naming service -DontUseNS = 1; +// Use with commandline: ryzom_admin_service -A. -C. -L. --nobreak --fulladminname=admin_executor_service --shortadminname=AES +#include "admin_executor_service_default.cfg" -AESAliasName= "aes"; +// ---- config local variables -// -DontUseStdIn = 0; - -// Address ofthe admin service (default port is 49996) +// Address of the admin service (default port is 49996) ASHost = "localhost"; +ASPort="46701"; -// Config for AES -AESPort = "46702"; -AESHost = "localhost"; -ASPort = "46701"; - - -// in second, -1 for not restarting -RestartDelay = 60; - -// how many second before aborting the request if not finished -RequestTimeout = 5; - -// log path for advanced log report -LogPath = "/."; - -// setup for deployment environment with exeternal configuration system responsible for launching apps and -// for configuring AES services -DontLaunchServicesDirectly = 1; -UseExplicitAESRegistration = 1; -KillServicesOnDisconnect = 1; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 0; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// how to sleep between to network update -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; +// ---- service NeL variables (used by ConfigFile class) -#include "./aes_alias_name.cfg" +AESAliasName= "aes_open"; StartCommands= { @@ -73,7 +32,6 @@ StartCommands= "gw_aes.transportAdd L3Client aes_l3c", "gw_aes.transportCmd aes_l3c(connect addr="+AESHost+":"+AESPort+")", - // create the admin executor service module "moduleManager.createModule AdminExecutorService aes", @@ -93,11 +51,31 @@ StartCommands= // plug the as "aes.plug asc_gw", "aes.plug aes_gw", +}; +StartCommands += +{ + "aes.addRegisteredService bms_master open", +// "aes.addRegisteredService bms_pd_master open", + "aes.addRegisteredService egs open", + "aes.addRegisteredService gpms open", + "aes.addRegisteredService ios open", + "aes.addRegisteredService rns open", + "aes.addRegisteredService rws open", + "aes.addRegisteredService ts open", + "aes.addRegisteredService ms open", + "aes.addRegisteredService ais_newbyland open", + "aes.addRegisteredService mfs open", + "aes.addRegisteredService su open", + "aes.addRegisteredService fes open", + "aes.addRegisteredService sbs open", + "aes.addRegisteredService lgs open", +// "aes.addRegisteredService mos open", +// "aes.addRegisteredService pdss open", + "aes.addRegisteredService ras open", }; -ShardName="dev"; bms_master = { "./", "/home/nevrax/dev/live/service_backup_service/backup_service", "-C. -L. --nobreak --writepid -P49990" }; bms_pd_master = { "./", "/home/nevrax/dev/live/service_backup_service/backup_service", "-C. -L. --nobreak --writepid -P49992" }; egs = { "./", "/home/nevrax/dev/live/service_entities_game_service/entities_game_service", "-C. -L. --nobreak --writepid" }; @@ -139,24 +117,33 @@ RegisteredServices= "ras", }; -StartCommands += -{ - "aes.addRegisteredService bms_master open", -// "aes.addRegisteredService bms_pd_master open", - "aes.addRegisteredService egs open", - "aes.addRegisteredService gpms open", - "aes.addRegisteredService ios open", - "aes.addRegisteredService rns open", - "aes.addRegisteredService rws open", - "aes.addRegisteredService ts open", - "aes.addRegisteredService ms open", - "aes.addRegisteredService ais_newbyland open", - "aes.addRegisteredService mfs open", - "aes.addRegisteredService su open", - "aes.addRegisteredService fes open", - "aes.addRegisteredService sbs open", - "aes.addRegisteredService lgs open", -// "aes.addRegisteredService mos open", -// "aes.addRegisteredService pdss open", - "aes.addRegisteredService ras open", -}; +// +DontUseStdIn = 0; + +// ---- service NeL variables (used by CVariable class) + +// If the update loop is too slow, a thread will produce an assertion. +// By default, the value is set to 10 minutes. +// Set to 0 for no assertion. +UpdateAssertionThreadTimeout = 0; + +// ---- service custom variables (used by ConfigFile class) + + // ---- service custom variables (used by CVariable class) + +// in second, -1 for not restarting +RestartDelay = 60; + +// how many second before aborting the request if not finished +RequestTimeout = 5; + +// log path for advanced log report +LogPath = "/."; + +// setup for deployment environment with exeternal configuration system responsible for launching apps and +// for configuring AES services +DontLaunchServicesDirectly = 1; +UseExplicitAESRegistration = 1; +KillServicesOnDisconnect = 1; + +ShardName="dev"; diff --git a/code/ryzom/server/admin_executor_service_default.cfg b/code/ryzom/server/admin_executor_service_default.cfg index 60d639fe1..d975823de 100644 --- a/code/ryzom/server/admin_executor_service_default.cfg +++ b/code/ryzom/server/admin_executor_service_default.cfg @@ -1 +1,7 @@ #include "common.cfg" + +// I'm the AES, I'll not connect to myself! +DontUseAES = 1; + +// I don't need a connection to a naming service +DontUseNS = 1; diff --git a/code/ryzom/server/admin_service.cfg b/code/ryzom/server/admin_service.cfg index 76be37ac4..59d4e3308 100644 --- a/code/ryzom/server/admin_service.cfg +++ b/code/ryzom/server/admin_service.cfg @@ -1,298 +1,22 @@ // Use with commandline: ryzom_admin_service --fulladminname=ryzom_admin_service --shortadminname=AS -C. -L. --nobreak --writepid -AESAliasName= "ras"; + +// ---- config local variables ASWebPort="46700"; ASPort="46701"; -AESPort="46702"; -SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; -SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; - -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; - -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; - -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; - -// Number of seconds between 2 logs to file -PDLogUpdate = 10; - -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; - -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" -}; - -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; - -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; - -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; - -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; - -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; - -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; - -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; - -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; - -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; - -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; - -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; #include "admin_service_default.cfg" -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; +// ---- service NeL variables (used by ConfigFile class) -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; +AESAliasName= "ras"; Paths = { ".", }; + +// ---- service NeL variables (used by CVariable class) + +// ---- service custom variables (used by ConfigFile class) + + // ---- service custom variables (used by CVariable class) diff --git a/code/ryzom/server/aes_alias_name.cfg b/code/ryzom/server/aes_alias_name.cfg deleted file mode 100644 index f3e6b4a64..000000000 --- a/code/ryzom/server/aes_alias_name.cfg +++ /dev/null @@ -1,3 +0,0 @@ -AESAliasName= "aes_open"; -AESPort="46702"; -ASPort="46701"; diff --git a/code/ryzom/server/ai_service.cfg b/code/ryzom/server/ai_service.cfg index 9547117e7..55f168607 100644 --- a/code/ryzom/server/ai_service.cfg +++ b/code/ryzom/server/ai_service.cfg @@ -1,312 +1,69 @@ // Use with commandline: ai_service -C. -L. --nobreak --writepid -mCommon:Newbieland:Post -AESAliasName= "ais_newbyland"; -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; +// ---- config local variables + SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "db1.ryzom.com"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", +// SU - listen address of the SU service (for L5 connections) +SUAddress = SUHost+":"+SUPort; - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", +#include "ai_service_default.cfg" - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; +// ---- service NeL variables (used by ConfigFile class) -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; +AESAliasName= "ais_newbyland"; +GraphVars += { "TickSpeedLoop", "0" }; +GraphVars += { "TickSpeedLoop", "60000" }; +GraphVars += { "L5CallbackCount", "0" }; +GraphVars += { "L5CallbackCount", "60000" }; +GraphVars += { "L5CallbackTime", "0" }; +GraphVars += { "L5CallbackTime", "60000" }; +GraphVars += { "MirrorCallbackCount", "0" }; +GraphVars += { "MirrorCallbackCount", "60000" }; +GraphVars += { "MirrorCallbackTime", "0" }; +GraphVars += { "MirrorCallbackTime", "60000" }; -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; +Paths = { + ".", + "../common/data_common", + "../common/data_leveldesign", +}; -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; +// ---- service NeL variables (used by CVariable class) -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; +// ---- service custom variables (used by ConfigFile class) -// Number of seconds between 2 logs to file -PDLogUpdate = 10; +#include "used_continents.cfg" -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; +// Mirror limits +DatasetSizefe_temp = 600000; +DatasetSizefame = 26000; -// This is the mapping for logical continent to physical one -ContinentNameTranslator = +// define the primitives configuration used. (AIS, EGS) +UsedPrimitives = { - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" + "newbieland_all", }; -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - // the following variable must be defined but should be empty - it's presence is used to change the behaviour // of the packed sheet reader GeorgePaths = { "" }; -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "/home/nevrax/live/save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; - -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; - -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; + // ---- service custom variables (used by CVariable class) -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; +NbPlayersLimit = PlayerLimit; -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; - -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; - -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; - -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; - -// AIS Specifics -------------------------------------------------------------------------- // Entity Limits (AIS) NbPetLimit = NbPlayersLimit*4; NbFaunaLimit = 50000; NbNpcLimit = 20000; NbFxLimit = 500; -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; - -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -#include "ai_service_default.cfg" -WriteFilesDirectory= "data_shard"; - -GraphVars += { "TickSpeedLoop", "0" }; -GraphVars += { "TickSpeedLoop", "60000" }; -GraphVars += { "L5CallbackCount", "0" }; -GraphVars += { "L5CallbackCount", "60000" }; -GraphVars += { "L5CallbackTime", "0" }; -GraphVars += { "L5CallbackTime", "60000" }; -GraphVars += { "MirrorCallbackCount", "0" }; -GraphVars += { "MirrorCallbackCount", "60000" }; -GraphVars += { "MirrorCallbackTime", "0" }; -GraphVars += { "MirrorCallbackTime", "60000" }; -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "../rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; +#include "backup_service_interface.cfg" -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; +// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) +IsRingShard = 0; -Paths = { - ".", - "../common/data_common", - "../common/data_leveldesign", -}; +// Disable ryzom verbose logging +VerboseMIRROR = 0; diff --git a/code/ryzom/server/backup_service.cfg b/code/ryzom/server/backup_service.cfg index da9d7aae7..2f95dea97 100644 --- a/code/ryzom/server/backup_service.cfg +++ b/code/ryzom/server/backup_service.cfg @@ -1,169 +1,19 @@ // Use with commandline: backup_service -C. -L. --nobreak --writepid -P49990 -AESAliasName= "bms_master"; -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; -SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; -SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; - -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; - -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; +#include "backup_service_default.cfg" -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; +// ---- config local variables -// Number of seconds between 2 logs to file -PDLogUpdate = 10; +// ---- service NeL variables (used by ConfigFile class) -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; +AESAliasName = "bms_master"; -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" +Paths = { + ".", + "../common/data_leveldesign", }; - -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; +// ---- service NeL variables (used by CVariable class) // Where to save specific shard data (ie: player backup), relatively to SaveShardRoot SaveFilesDirectory = ""; @@ -171,135 +21,14 @@ SaveFilesDirectory = ""; // where to save generic shard data (ie: packed_sheet) WriteFilesDirectory = "data_shard"; -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; +// ---- service custom variables (used by ConfigFile class) -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; +WebPort = 49970; -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; + // ---- service custom variables (used by CVariable class) -// MFS - Directories -WebRootDirectory = "../www"; +// BS - Root directory where data are backuped to +IncrementalBackupDirectory = "../incremental_backup"; // Root directory where data from shards are stored into SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; - -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; - -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; - -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; - -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -#include "backup_service_default.cfg" - -ListeningPort = 49990; -L3ListeningPort = 49950; -WebPort = 49970; -BSReadState = 1; -SaveShardRoot = "save_shard"; -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; - -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; - -Paths = { - ".", - "../common/data_leveldesign", -}; diff --git a/code/ryzom/server/backup_service_default.cfg b/code/ryzom/server/backup_service_default.cfg index a1cf1868c..6e8263dca 100644 --- a/code/ryzom/server/backup_service_default.cfg +++ b/code/ryzom/server/backup_service_default.cfg @@ -1,23 +1,31 @@ #include "common.cfg" + +// ---- service NeL variables (used by ConfigFile class) + +DontUseNS = 1; -DontUseNS = BSDontUseNS; -NSHost = BSNSHost; +// ---- service NeL variables (used by CVariable class) ListeningPort = 49990; + +// ---- service custom variables (used by ConfigFile class) + +// Listening port for the Web server to connect in + +WebPort = 49898; + +BSReadState = 1; + + // ---- service custom variables (used by CVariable class) // Port for the Layer 3 interface of the backup service L3ListeningPort = 49950; -// Listening port for the Web server to connect in -WebPort = 49898; - // template path from SaveShardRoot to find character saves SaveTemplatePath = "$shard/characters/account_$userid_$charid$ext"; // character saves possible extension list -SaveExtList = "_pdr.bin _pdr.xml .bin"; - -BSReadState = 1; +SaveExtList = "_pdr.bin _pdr.xml .bin"; //BSFilePrefix = "R:/code/ryzom/r2_shard/"; //BSFileSubst = "r2_shard/"; diff --git a/code/ryzom/server/backup_service_interface.cfg b/code/ryzom/server/backup_service_interface.cfg new file mode 100644 index 000000000..884eede99 --- /dev/null +++ b/code/ryzom/server/backup_service_interface.cfg @@ -0,0 +1,5 @@ +L3BSPort = "49950"; +BSHost = "localhost:49990"; +UseBS = 1; +// Root directory where data from shards are stored into +SaveShardRoot = "save_shard/"; diff --git a/code/ryzom/server/common.cfg b/code/ryzom/server/common.cfg index d1e291442..2c209c152 100644 --- a/code/ryzom/server/common.cfg +++ b/code/ryzom/server/common.cfg @@ -1,2 +1,99 @@ +// ---- config local variables + +// Used by ConfigFile in EGS and WS +ShardId = 302; + +// Used by CVariable in WS +PlayerLimit = 5000; + +// Used to connect to AES (this file) and to set up AES service (admin_executor_service.cfg) +AESPort="46702"; +AESHost="localhost"; + +// ---- service NeL variables (used by ConfigFile class) WindowStyle = "WIN"; + +// don't connect to the old NeLNS AES +DontUseAES = 1; + +// Configure module gateway for layer 5 module comm +StartCommands += +{ + // Create a gateway module + "moduleManager.createModule StandardGateway gw", + // add a layer 5 transport + "gw.transportAdd L5Transport l5", + // open the transport + "gw.transportCmd l5(open)", + + /// Create default connection with admin executor service + // Create a gateway module + "moduleManager.createModule StandardGateway gw_aes", + // create the admin executor service module + "moduleManager.createModule AdminExecutorServiceClient aes_client", + "aes_client.plug gw_aes", + + // create a layer 3 client to connect to aes gateway + "gw_aes.transportAdd L3Client aes_l3c", + "gw_aes.transportCmd aes_l3c(connect addr="+AESHost+":"+AESPort+")", +}; + +NSHost = "localhost"; + +// A list of vars to graph for any service +GraphVars += +{ + "ProcessUsedMemory", "60000", // every minute +}; + +IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; + +// Set a mainland SessionId. +// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards +// Dev: Can be non-zero to initially connect a client to a ring shard +NoWSShardId = ShardId; + +// ---- service NeL variables (used by CVariable class) + +// Disable generation / display of nldebug messages +DisableNLDebug = 1; + +// Disable nel net verbose logging +VerboseNETTC = 0; +VerboseLNETL0 = 0; +VerboseLNETL1 = 0; +VerboseLNETL2 = 0; +VerboseLNETL3 = 0; +VerboseLNETL4 = 0; +VerboseLNETL5 = 0; +VerboseLNETL6 = 0; + +// If the update loop is too slow, a thread will produce an assertion. +// By default, the value is set to 10 minutes. +// Set to 0 for no assertion. +UpdateAssertionThreadTimeout = 6000000; + +// how to sleep between 2 network updates +// 0 = pipe +// 1 = usleep +// 2 = nanosleep +// 3 = sched_yield +// 4 = nothing +UseYieldMethod = 0; + +DefaultMaxExpectedBlockSize = 200000000; // 200 M ! +DefaultMaxSentBlockSize = 200000000; // 200 M ! + +// Will SaveFilesDirectory will be converted to a full path? +ConvertSaveFilesDirectoryToFullPath = 0; + +// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot +SaveFilesDirectory = ""; + +// where to save generic shard data (ie: packed_sheet) +WriteFilesDirectory = "data_shard"; + +// ---- service custom variables (used by ConfigFile class) + + // ---- service custom variables (used by CVariable class) diff --git a/code/ryzom/server/entities_game_service.cfg b/code/ryzom/server/entities_game_service.cfg index a73619c33..8835d9cd2 100644 --- a/code/ryzom/server/entities_game_service.cfg +++ b/code/ryzom/server/entities_game_service.cfg @@ -1,282 +1,94 @@ // Use with commandline: entities_game_service -C. -L. --nobreak --writepid -AESAliasName= "egs"; -ASWebPort="46700"; -ASPort="46701"; +// ---- config local variables + +#define DONT_USE_LGS_SLAVE + AESPort="46702"; SUPort = 50505; SUGlobalPort = 50503; -L3BSPort = "49950"; L3MasterLGSPort = 41292; L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; MasterLGSHost = "localhost"; SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; - -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; +// SU - listen address of the SU service (for L5 connections) +SUAddress = SUHost+":"+SUPort; -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; +#include "entities_game_service_default.cfg" -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; +// ---- service NeL variables (used by ConfigFile class) -// Number of seconds between 2 logs to file -PDLogUpdate = 10; - -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; +AESAliasName= "egs"; -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" +StartCommands += { +"moduleManager.createModule AnimSessionManager asm", +"asm.plug gw", }; -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; +// start commands for setting up the exchange level caps of different ryzom shards +StartCommands += { "setShardExchangeLimit 302 250" }; -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; +StartCommands += { "displayShardExchangeLimits" }; +StartCommands += { "EnableStlAllocatorChecker 0" }; -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; +GraphVars += { "CharacterLoadPerTick", "0" }; +GraphVars += { "CharacterLoadPerTick", "60000" }; +GraphVars += { "CharacterSavePerTick", "0" }; +GraphVars += { "CharacterSavePerTick", "60000" }; +GraphVars += { "TickSpeedLoop", "0" }; +GraphVars += { "TickSpeedLoop", "60000" }; +GraphVars += { "L5CallbackCount", "0" }; +GraphVars += { "L5CallbackCount", "60000" }; +GraphVars += { "L5CallbackTime", "0" }; +GraphVars += { "L5CallbackTime", "60000" }; +GraphVars += { "MirrorCallbackCount", "0" }; +GraphVars += { "MirrorCallbackCount", "60000" }; +GraphVars += { "MirrorCallbackTime", "0" }; +GraphVars += { "MirrorCallbackTime", "60000" }; -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; +NSHost = "localhost"; -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; +Paths = { + ".", + "../common/data_common", + "../common/data_leveldesign", +}; +PathsNoRecurse= {"."}; -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; +// ---- service NeL variables (used by CVariable class) -// MFS - Directories -WebRootDirectory = "../www"; +// ---- service custom variables (used by ConfigFile class) -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; +WebSrvHost = "http://localhost:55555/"; -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; +NbPlayersLimit = PlayerLimit; NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- // Entity Limits (EGS) NbObjectsLimit = 2000; NbNpcSpawnedByEGSLimit = 5000; NbForageSourcesLimit = 10000; NbToxicCloudsLimit = 5000; -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; +#include "used_continents.cfg" -// This is the list of continent to use with their unique instance number -UsedContinents = +// define the primitives configuration used. +UsedPrimitives = { - "newbieland", "20", + "newbieland_all", }; -// define the primitives configuration used. -UsedPrimitives = +// the following variable must be defined but should be empty - it's presence is used to change the behaviour +// of the packed sheet reader +GeorgePaths = { "" }; + +HomeMainlandNames = { - "newbieland_all", +"302", "Open", "open", }; -//UsedContinents = { "dummy", "10000" }; -#include "entities_game_service_default.cfg" -PathsNoRecurse= {"."}; -NeverAggroPriv = ":OBSERVER:G:SG:GM:SGM:EM:"; -AlwaysInvisiblePriv = ":OBSERVER:EM:"; -TimeBeforeDisconnection = 300; + /* UsedContinents += { @@ -328,54 +140,64 @@ UsedPrimitives = }; */ -StartCommands += { -"moduleManager.createModule AnimSessionManager asm", -"asm.plug gw", -}; -GraphVars += { "NbPlayers", "60000" }; -GraphVars += { "CharacterLoadPerTick", "0" }; -GraphVars += { "CharacterLoadPerTick", "60000" }; -GraphVars += { "CharacterSavePerTick", "0" }; -GraphVars += { "CharacterSavePerTick", "60000" }; -GraphVars += { "TickSpeedLoop", "0" }; -GraphVars += { "TickSpeedLoop", "60000" }; -GraphVars += { "L5CallbackCount", "0" }; -GraphVars += { "L5CallbackCount", "60000" }; -GraphVars += { "L5CallbackTime", "0" }; -GraphVars += { "L5CallbackTime", "60000" }; -GraphVars += { "MirrorCallbackCount", "0" }; -GraphVars += { "MirrorCallbackCount", "60000" }; -GraphVars += { "MirrorCallbackTime", "0" }; -GraphVars += { "MirrorCallbackTime", "60000" }; +// Mirror limits +DatasetSizefe_temp = 600000; +DatasetSizefame = 26000; + + // ---- service custom variables (used by CVariable class) + +RingRPEnabled=0; RingRPXPRequiredPerAction=700; RingRPXPRequiredPerTimeSlice=700; + MaxXPGainPerPlayer = 30.0; DeathXPFactor = 0.1; -CachePrims = 1; -CorrectInvalidPlayerPositions = 1; -WebSrvHost = "http://localhost:55555/"; -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; +MFSHost = "localhost"; -Paths = { - ".", - "../common/data_common", - "../common/data_leveldesign", -}; +// Use Shard Unifier or not +DontUseSU = 0; + +// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) +IsRingShard = 0; + +// Set a mainland SessionId. +// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards +// Dev: Can be non-zero to initially connect a client to a ring shard +FixedSessionId = ShardId; + +// Level limit for newb scenarios +FreeTrialSkillLimit=21; + +// Level limit for newb scenarios +DefaultInterShardExchangeLevelCap=0; + +// Disable ryzom verbose logging +VerboseMIRROR = 0; +VerboseRingRPLog = 0; +VerboseCDBGroup = 0; + +// What to do with characters coming from another mainland shard? +// 0: teleport to the stored session id +// 1: let the character play anyway, but leave the stored session id unchanged +// 2: assign the stored session id with FixedSessionId and let play +AllowCharsFromAllSessions = 0; + +/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) + * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" + * Only log analyser must have the $shard parameter to find all shards root directory + */ +PDRootDirectory = ""; + +// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log +PDEnableLog = 1; + +// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log +PDEnableStringLog = 0; + +// Number of seconds between 2 logs to file +PDLogUpdate = 10; + +#include "backup_service_interface.cfg" + +XMLSave = 0; diff --git a/code/ryzom/server/entities_game_service_default.cfg b/code/ryzom/server/entities_game_service_default.cfg index 1d8dc73cc..763eefe18 100644 --- a/code/ryzom/server/entities_game_service_default.cfg +++ b/code/ryzom/server/entities_game_service_default.cfg @@ -1,7 +1,5 @@ #include "common.cfg" -#ifndef DONT_USE_LGS_SLAVE - StartCommands += { // L5 connect to the shard unifier @@ -24,64 +22,22 @@ StartCommands += "lgs_gw.transportAdd L3Client masterL3c", // open the transport "lgs_gw.transportCmd masterL3c(connect addr="+MasterLGSHost+":"+L3MasterLGSPort+")", - +}; + +#ifndef DONT_USE_LGS_SLAVE + +StartCommands += +{ // add a layer 3 server transport for slave logger service "lgs_gw.transportAdd L3Client slaveL3c", // open the transport "lgs_gw.transportCmd slaveL3c(connect addr="+SlaveLGSHost+":"+L3SlaveLGSPort+")", - - // Create a shard unifier client module - "moduleManager.createModule ShardUnifierClient suc", - // Create a client commands forwader module - "moduleManager.createModule ClientCommandForwader ccf", - - // Create a characer control module - "moduleManager.createModule CharacterControl cc", - - // Create a guild unifier module - "moduleManager.createModule GuildUnifier gu", - - //Create a shard unifier name mapper - "moduleManager.createModule CharNameMapperClient cnmc", - - // Create the logger service client module - "moduleManager.createModule LoggerServiceClient lsc", - - "suc.plug gw", - "ccf.plug gw", - "cc.plug gw", - "gu.plug glob_gw", - "cnmc.plug gw", - "lsc.plug lgs_gw", -}; - +}; + #endif - -#ifdef DONT_USE_LGS_SLAVE - + StartCommands += -{ - // L5 connect to the shard unifier - "unifiedNetwork.addService ShardUnifier ( address="+SUAddress+" sendId external autoRetry )", - - // Create a gateway for global interconnection - // modules from different shard are visible to each other if they connect to - // this gateway. SU Local module have no interest to be plugged here. - "moduleManager.createModule StandardGateway glob_gw", - // add a layer 3 server transport - "glob_gw.transportAdd L3Client l3c", - // open the transport - "glob_gw.transportCmd l3c(connect addr="+SUHost+":"+SUGlobalPort+")", - - - // Create a gateway for logger service connection - "moduleManager.createModule StandardGateway lgs_gw", - - // add a layer 3 server transport for master logger service - "lgs_gw.transportAdd L3Client masterL3c", - // open the transport - "lgs_gw.transportCmd masterL3c(connect addr="+MasterLGSHost+":"+L3MasterLGSPort+")", - +{ // Create a shard unifier client module "moduleManager.createModule ShardUnifierClient suc", // Create a client commands forwader module @@ -105,7 +61,6 @@ StartCommands += "gu.plug glob_gw", "cnmc.plug gw", "lsc.plug lgs_gw", - }; #endif diff --git a/code/ryzom/server/frontend_service.cfg b/code/ryzom/server/frontend_service.cfg index 026f08a0b..c9392bd51 100644 --- a/code/ryzom/server/frontend_service.cfg +++ b/code/ryzom/server/frontend_service.cfg @@ -1,280 +1,18 @@ // Use with commandline: frontend_service -C. -L. --nobreak --writepid -AESAliasName= "fes"; - -//AcceptInvalidCookie = 1; - -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; -SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; -SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; - -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; - -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; - -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; - -// Number of seconds between 2 logs to file -PDLogUpdate = 10; - -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; - -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" -}; - -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; - -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; - -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; - -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; - -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; +// ---- config local variables -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "open.ryzom.com"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; - -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- // Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth BandwidthRatio = 1; -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; +FSUDPPort = 47851; +FSListenHost = "open.ryzom.com"; -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; +#include "frontend_service_default.cfg" -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; +// ---- service NeL variables (used by ConfigFile class) -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -FSUDPPort = 47851; -#include "frontend_service_default.cfg" +AESAliasName= "fes"; GraphVars += { "TickSpeedLoop", "0" }; GraphVars += { "TickSpeedLoop", "60000" }; @@ -286,28 +24,29 @@ GraphVars += { "MirrorCallbackCount", "0" }; GraphVars += { "MirrorCallbackCount", "60000" }; GraphVars += { "MirrorCallbackTime", "0" }; GraphVars += { "MirrorCallbackTime", "60000" }; -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; - -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; Paths = { "../common/data_common", ".", "../common/data_leveldesign", }; + +// ---- service NeL variables (used by CVariable class) + +// ---- service custom variables (used by ConfigFile class) + +//AcceptInvalidCookie = 1; + +ClientLimit = 1000; + +// Mirror limits +DatasetSizefe_temp = 600000; +DatasetSizefame = 26000; + + // ---- service custom variables (used by CVariable class) + +// Disable ryzom verbose logging +VerboseMIRROR = 0; + +// Root directory where data from shards are stored into +SaveShardRoot = "save_shard/"; diff --git a/code/ryzom/server/gpm_service.cfg b/code/ryzom/server/gpm_service.cfg index 07bdc52eb..b3d254734 100644 --- a/code/ryzom/server/gpm_service.cfg +++ b/code/ryzom/server/gpm_service.cfg @@ -1,311 +1,44 @@ // Use with commandline: gpm_service -C. -L. --nobreak --writepid -AESAliasName= "gpms"; - -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; -SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; -SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; +#include "gpm_service_default.cfg" -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; +// ---- config local variables -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; +// ---- service NeL variables (used by ConfigFile class) -// Number of seconds between 2 logs to file -PDLogUpdate = 10; +AESAliasName= "gpms"; -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; +GraphVars += { "TickSpeedLoop", "0" }; +GraphVars += { "TickSpeedLoop", "60000" }; +GraphVars += { "L5CallbackCount", "0" }; +GraphVars += { "L5CallbackCount", "60000" }; +GraphVars += { "L5CallbackTime", "0" }; +GraphVars += { "L5CallbackTime", "60000" }; +GraphVars += { "MirrorCallbackCount", "0" }; +GraphVars += { "MirrorCallbackCount", "60000" }; +GraphVars += { "MirrorCallbackTime", "0" }; +GraphVars += { "MirrorCallbackTime", "60000" }; -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" +Paths = { + ".", + "../common/data_common", + "../common/data_leveldesign", }; -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; +// ---- service NeL variables (used by CVariable class) -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; +// ---- service custom variables (used by ConfigFile class) -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; - -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; - -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; - -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; - -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; - -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; +#include "used_continents.cfg" // Mirror limits DatasetSizefe_temp = 600000; DatasetSizefame = 26000; -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; - -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; + // ---- service custom variables (used by CVariable class) -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; - -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -//#include "../live/cfg/gpm_service_mainland.cfg" -#include "gpm_service_default.cfg" - -GraphVars += { "TickSpeedLoop", "0" }; -GraphVars += { "TickSpeedLoop", "60000" }; -GraphVars += { "L5CallbackCount", "0" }; -GraphVars += { "L5CallbackCount", "60000" }; -GraphVars += { "L5CallbackTime", "0" }; -GraphVars += { "L5CallbackTime", "60000" }; -GraphVars += { "MirrorCallbackCount", "0" }; -GraphVars += { "MirrorCallbackCount", "60000" }; -GraphVars += { "MirrorCallbackTime", "0" }; -GraphVars += { "MirrorCallbackTime", "60000" }; -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; - -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; +// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) +IsRingShard = 0; -Paths = { - ".", - "../common/data_common", - "../common/data_leveldesign", -}; +// Disable ryzom verbose logging +VerboseMIRROR = 0; diff --git a/code/ryzom/server/gpm_service_default.cfg b/code/ryzom/server/gpm_service_default.cfg index a6835c65c..ddca7f76d 100644 --- a/code/ryzom/server/gpm_service_default.cfg +++ b/code/ryzom/server/gpm_service_default.cfg @@ -1,5 +1,5 @@ #include "common.cfg" - + CheckPlayerSpeed = 0; SecuritySpeedFactor = 1.5; diff --git a/code/ryzom/server/input_output_service.cfg b/code/ryzom/server/input_output_service.cfg index 415a24b34..dbc9f339b 100644 --- a/code/ryzom/server/input_output_service.cfg +++ b/code/ryzom/server/input_output_service.cfg @@ -1,180 +1,70 @@ // Use with commandline: input_output_service -C. -L. --nobreak --writepid -AESAliasName= "ios"; -ASWebPort="46700"; -ASPort="46701"; +// ---- config local variables + +#define DONT_USE_LGS_SLAVE + AESPort="46702"; SUPort = 50505; SUGlobalPort = 50503; -L3BSPort = "49950"; L3MasterLGSPort = 41292; L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; MasterLGSHost = "localhost"; SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; - -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; - -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; +// SU - listen address of the SU service (for L5 connections) +SUAddress = SUHost+":"+SUPort; -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; +#include "input_output_service_default.cfg" -// Number of seconds between 2 logs to file -PDLogUpdate = 10; +// ---- service NeL variables (used by ConfigFile class) -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; +AESAliasName= "ios"; -// This is the mapping for logical continent to physical one -ContinentNameTranslator = +// Create a char name mapper +StartCommands += { - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" +"moduleManager.createModule CharNameMapper cnm", +"cnm.plug gw", +"moduleManager.createModule IOSRingModule iosrm", +"iosrm.plug gw", }; -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; +Paths = { + ".", + "../common/data_common", + "../common/data_leveldesign", +}; -// Level limit for newb scenarios -FreeTrialSkillLimit=21; +// ---- service NeL variables (used by CVariable class) -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; +// ---- service custom variables (used by ConfigFile class) -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; +// Mirror limits +DatasetSizefe_temp = 600000; +DatasetSizefame = 26000; // the following variable must be defined but should be empty - it's presence is used to change the behaviour // of the packed sheet reader GeorgePaths = { "" }; -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - // Use Shard Unifier or not DontUseSU = 0; -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; +HomeMainlandNames = +{ +"302", "Open", "open", +}; -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; + // ---- service custom variables (used by CVariable class) -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; +// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) +IsRingShard = 0; -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; +// Disable ryzom verbose logging +VerboseMIRROR = 0; -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; +#include "backup_service_interface.cfg" // IOS - Directory to store ios.string_cache file StringManagerCacheDirectory = "data_shard_local"; @@ -182,132 +72,10 @@ StringManagerCacheDirectory = "data_shard_local"; // IOS - Directory to log chat into LogChatDirectory = "data_shard_local"; -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; - -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; - -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; - -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; - -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -#include "input_output_service_default.cfg" - +ReadTranslationWork = 1; +TranslationWorkPath = ""; VerboseStringManager = 0; VerboseStringManagerParser = 0; VerboseChat = 0; VerboseChatManagement = 0; VerboseNameTranslation = 0; -// Create a char name mapper -StartCommands += -{ -"moduleManager.createModule CharNameMapper cnm", -"cnm.plug gw", -"moduleManager.createModule IOSRingModule iosrm", -"iosrm.plug gw", -}; -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; - -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; - -Paths = { - ".", - "../common/data_common", - "../common/data_leveldesign", -}; diff --git a/code/ryzom/server/input_output_service_default.cfg b/code/ryzom/server/input_output_service_default.cfg index 5bc2c6537..ba819ad8f 100644 --- a/code/ryzom/server/input_output_service_default.cfg +++ b/code/ryzom/server/input_output_service_default.cfg @@ -1,6 +1,6 @@ #include "common.cfg" - -#ifndef DONT_USE_LGS_SLAVE + +// ---- service NeL variables (used by ConfigFile class) StartCommands += { @@ -23,52 +23,25 @@ StartCommands += "lgs_gw.transportAdd L3Client masterL3c", // open the transport "lgs_gw.transportCmd masterL3c(connect addr="+MasterLGSHost+":"+L3MasterLGSPort+")", - +}; + +#ifndef DONT_USE_LGS_SLAVE + +StartCommands += +{ // add a layer 3 server transport for slave logger service "lgs_gw.transportAdd L3Client slaveL3c", // open the transport "lgs_gw.transportCmd slaveL3c(connect addr="+SlaveLGSHost+":"+L3SlaveLGSPort+")", - - // Create a chat unifier client - "moduleManager.createModule ChatUnifierClient cuc", - - // and plug it on the gateway to reach the SU ChatUnifierServer - "cuc.plug glob_gw", - "cuc.plug gw", - - // Create the logger service client module - "moduleManager.createModule LoggerServiceClient lsc", - "lsc.plug lgs_gw", -}; - +}; + #endif - -#ifdef DONT_USE_LGS_SLAVE - + StartCommands += -{ - // L5 connect to the shard unifier - "unifiedNetwork.addService ShardUnifier ( address="+SUAddress+" sendId external autoRetry )", - - // Create a gateway for global interconnection - // modules from different shard are visible to each other if they connect to - // this gateway. SU Local module have no interest to be plugged here. - "moduleManager.createModule StandardGateway glob_gw", - // add a layer 3 server transport - "glob_gw.transportAdd L3Client l3c", - // open the transport - "glob_gw.transportCmd l3c(connect addr="+SUHost+":"+SUGlobalPort+")", - - // Create a gateway for logger service connection - "moduleManager.createModule StandardGateway lgs_gw", - - // add a layer 3 server transport for master logger service - "lgs_gw.transportAdd L3Client masterL3c", - // open the transport - "lgs_gw.transportCmd masterL3c(connect addr="+MasterLGSHost+":"+L3MasterLGSPort+")", - +{ // Create a chat unifier client "moduleManager.createModule ChatUnifierClient cuc", + // and plug it on the gateway to reach the SU ChatUnifierServer "cuc.plug glob_gw", "cuc.plug gw", @@ -76,36 +49,36 @@ StartCommands += // Create the logger service client module "moduleManager.createModule LoggerServiceClient lsc", "lsc.plug lgs_gw", - }; #endif - -DisableMonotonicClock = 1; - + +// ---- service NeL variables (used by CVariable class) + +// ---- service custom variables (used by ConfigFile class) + // a list of system command that can be run with "sysCmd" service command. SystemCmd = {}; - + // IOS don't use work directory by default ReadTranslationWork = 0; TranslationWorkPath = "translation/work"; - + // Global shard bot name translation file. You sould overide this // in input_output_service.cfg to specialize the file // depending on the shard main language. BotNameTranslationFile = "bot_names.txt"; - + // Global shard event faction translation file. You sould override this // in input_output_service.cfg to specialize the file // depending on the shard main language. EventFactionTranslationFile = "event_factions.txt"; + + // ---- service custom variables (used by CVariable class) // Activate/deactivate debugging of missing paremeter replacement DebugReplacementParameter = 1; - -// Id of database for PDS Chat Logging -DatabaseId = 1; - + // Default verbose debug flags: //----------------------------- diff --git a/code/ryzom/server/logger_service.cfg b/code/ryzom/server/logger_service.cfg index 0c4c53c7d..4f6dd85c6 100644 --- a/code/ryzom/server/logger_service.cfg +++ b/code/ryzom/server/logger_service.cfg @@ -1,317 +1,50 @@ // Use with commandline: logger_service -C. -L. --nobreak --writepid + #include "logger_service_default.cfg" -AESAliasName= "lgs"; +// ---- config local variables -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; -SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; -SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "db1.ryzom.com"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", +LGSL3Port = 41292; - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", +// ---- service NeL variables (used by ConfigFile class) - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; +AESAliasName= "lgs"; -/// A list of vars to graph for any service -GraphVars = +StartCommands += { - "ProcessUsedMemory", "60000", // every minute +"moduleManager.createModule LoggerService ls", +"moduleManager.createModule StandardGateway lgs_gw", +"ls.plug lgs_gw", +"lgs_gw.transportAdd L3Server l3s", +"lgs_gw.transportOptions l3s(PeerInvisible)", +"lgs_gw.transportCmd l3s(open port="+ LGSL3Port +")", }; +DontUseNS = 1; -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; - -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; - -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; - -// Number of seconds between 2 logs to file -PDLogUpdate = 10; - -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; - -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" +Paths = { + ".", + "../common/data_leveldesign", }; -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "/home/nevrax/live/save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; +// ---- service NeL variables (used by CVariable class) // Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; +SaveFilesDirectory = "save_shard/"; // where to save generic shard data (ie: packed_sheet) WriteFilesDirectory = "r2_shard/data_shard"; -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; - -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; - -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; - -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_dev"; -// Nel DB user -DBNelUser = "su_dev"; -// Ring DB user -DBRingUser = "su_dev"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; +// ---- service custom variables (used by ConfigFile class) -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; - -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; - -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; - -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; - -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -#include "logger_service_default.cfg" -LogQueryResultFile = "log_query_result.txt"; -SaveFilesDirectory = "save_shard/"; -BSHost = LGSBSHost+":"+LGSBSPort; -L3BSPort = LGSBSPort; -DontUseNS = 1; +// Use Shard Unifier or not +DontUseSU = 0; -StartCommands += -{ -"moduleManager.createModule LoggerService ls", -"moduleManager.createModule StandardGateway lgs_gw", -"ls.plug lgs_gw", -"lgs_gw.transportAdd L3Server l3s", -"lgs_gw.transportOptions l3s(PeerInvisible)", -"lgs_gw.transportCmd l3s(open port="+ LGSL3Port +")", -}; -SaveShardRoot = "save_shard"; -SaveFilesDirectory = "save_shard/"; -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; HomeMainlandNames = { -"302", "Open", "open", +"302", "Open", "open", }; -RRDVarPath = "../rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; + // ---- service custom variables (used by CVariable class) -Paths = { - ".", - "../common/data_leveldesign", -}; +#include "backup_service_interface.cfg" diff --git a/code/ryzom/server/mail_forum_service.cfg b/code/ryzom/server/mail_forum_service.cfg index c4e5e51e3..d84cb466c 100644 --- a/code/ryzom/server/mail_forum_service.cfg +++ b/code/ryzom/server/mail_forum_service.cfg @@ -1,299 +1,19 @@ // Use with commandline: mail_forum_service -C. -L. --nobreak --writepid -AESAliasName= "mfs"; - -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; -SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; -SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "db1.ryzom.com"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; - -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; - -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; - -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; - -// Number of seconds between 2 logs to file -PDLogUpdate = 10; - -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; - -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" -}; - -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "/home/nevrax/live/save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; - -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; - -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "r2_shard/data_shard"; - -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; - -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; - -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; - -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_dev"; -// Nel DB user -DBNelUser = "su_dev"; -// Ring DB user -DBRingUser = "su_dev"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; - -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; +#include "mail_forum_service_default.cfg" -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; +// ---- config local variables -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; +// ---- service NeL variables (used by ConfigFile class) -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; +AESAliasName= "mfs"; -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", +Paths = { + ".", }; -#include "mail_forum_service_default.cfg" -WriteFilesDirectory="data_shard"; -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "../rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; +// ---- service NeL variables (used by CVariable class) -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; +// ---- service custom variables (used by ConfigFile class) -Paths = { - ".", -}; + // ---- service custom variables (used by CVariable class) diff --git a/code/ryzom/server/mail_forum_service_default.cfg b/code/ryzom/server/mail_forum_service_default.cfg index 84c499af6..a76b710be 100644 --- a/code/ryzom/server/mail_forum_service_default.cfg +++ b/code/ryzom/server/mail_forum_service_default.cfg @@ -1,7 +1,16 @@ #include "common.cfg" + +// ---- service NeL variables (used by ConfigFile class) + +DontUseNS = 1; + +// ---- service NeL variables (used by CVariable class) + +// ---- service custom variables (used by ConfigFile class) + + // ---- service custom variables (used by CVariable class) WebRootDirectory = "save_shard/www"; -DontUseNS = 1; // Set if Hall of Fame generator is enabled HoFEnableGenerator = 1; diff --git a/code/ryzom/server/mirror_service.cfg b/code/ryzom/server/mirror_service.cfg index 047c00a1c..eafe07456 100644 --- a/code/ryzom/server/mirror_service.cfg +++ b/code/ryzom/server/mirror_service.cfg @@ -1,306 +1,38 @@ // Use with commandline: mirror_service -C. -L. --nobreak --writepid -AESAliasName= "ms"; - -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; -SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; -SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; +#include "mirror_service_default.cfg" -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; +// ---- config local variables -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; +// ---- service NeL variables (used by ConfigFile class) -// Number of seconds between 2 logs to file -PDLogUpdate = 10; +AESAliasName= "ms"; -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; +GraphVars += { "UserSpeedLoop", "0" }; +GraphVars += { "UserSpeedLoop", "60000" }; +GraphVars += { "L5CallbackCount", "0" }; +GraphVars += { "L5CallbackCount", "60000" }; +GraphVars += { "L5CallbackTime", "0" }; +GraphVars += { "L5CallbackTime", "60000" }; -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" +Paths = { + ".", + "../common/data_common", + "../common/data_leveldesign", }; -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - +// ---- service NeL variables (used by CVariable class) -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; +// ---- service custom variables (used by ConfigFile class) -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! +// Mirror limits +DatasetSizefe_temp = 600000; +DatasetSizefame = 26000; // MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) MaxOutBandwidth = 100000000; -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; + // ---- service custom variables (used by CVariable class) // Disable ryzom verbose logging VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; - -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; - -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; - -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; - -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; - -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; - -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; - -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; - -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; - -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; - -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -#include "mirror_service_default.cfg" - -GraphVars += { "UserSpeedLoop", "0" }; -GraphVars += { "UserSpeedLoop", "60000" }; -GraphVars += { "L5CallbackCount", "0" }; -GraphVars += { "L5CallbackCount", "60000" }; -GraphVars += { "L5CallbackTime", "0" }; -GraphVars += { "L5CallbackTime", "60000" }; -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; - -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; - -Paths = { - ".", - "../common/data_common", - "../common/data_leveldesign", -}; diff --git a/code/ryzom/server/mirror_service_default.cfg b/code/ryzom/server/mirror_service_default.cfg index e46879247..38f2f169a 100644 --- a/code/ryzom/server/mirror_service_default.cfg +++ b/code/ryzom/server/mirror_service_default.cfg @@ -1,4 +1,6 @@ #include "common.cfg" +// ---- service custom variables (used by ConfigFile class) + // Linux only DestroyGhostSegments = 1; diff --git a/code/ryzom/server/naming_service.cfg b/code/ryzom/server/naming_service.cfg index 7217d8459..7acf8316e 100644 --- a/code/ryzom/server/naming_service.cfg +++ b/code/ryzom/server/naming_service.cfg @@ -1,298 +1,21 @@ // Use with commandline: ryzom_naming_service -C. -L. --nobreak --writepid -AESAliasName= "rns"; - -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; -SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; -SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; - -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; - -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; +#include "naming_service_default.cfg" -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; +// ---- config local variables -// Number of seconds between 2 logs to file -PDLogUpdate = 10; +// ---- service NeL variables (used by ConfigFile class) -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; +AESAliasName= "rns"; -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" +Paths = { + "data_www" }; -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; +// ---- service NeL variables (used by CVariable class) -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; +// ---- service custom variables (used by ConfigFile class) -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; - -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; - -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; - -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; - -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; - -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; - -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; - -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; - -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; - -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; - -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -#include "naming_service_default.cfg" - -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; - -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; - -Paths = { - "data_www" -}; + // ---- service custom variables (used by CVariable class) diff --git a/code/ryzom/server/session_browser_server.cfg b/code/ryzom/server/session_browser_server.cfg index f2afb1983..63fa70daf 100644 --- a/code/ryzom/server/session_browser_server.cfg +++ b/code/ryzom/server/session_browser_server.cfg @@ -1,279 +1,19 @@ // Use with commandline: session_browser_server -C. -L. --nobreak --writepid -AESAliasName= "sbs"; - -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; -SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; -SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; - -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; - -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; - -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; - -// Number of seconds between 2 logs to file -PDLogUpdate = 10; - -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; - -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" -}; - -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; - -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; - -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; - -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; - -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; +#include "session_browser_server_default.cfg" -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; +// ---- config local variables -// MFS - Directories -WebRootDirectory = "../www"; +#include "sql.cfg" -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; +SBSPort = 48851; -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; - -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; +SUHost = "localhost"; -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; +// ---- service NeL variables (used by ConfigFile class) -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; +AESAliasName= "sbs"; -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -FSUDPPort = 47851; -SBSPort = FSUDPPort+1000; -DontUseNS = 0; StartCommands += { "moduleManager.createModule SessionBrowserServerMod sbs suAddr="+SUHost+":49999 listenPort="+SBSPort+" ring_db(host="+DBHost+" user="+DBRingUser+" password="+DBRingPass+" base="+DBRingName+")", @@ -286,26 +26,24 @@ GraphVars += { "L5CallbackCount", "0" }; GraphVars += { "L5CallbackCount", "60000" }; GraphVars += { "L5CallbackTime", "0" }; GraphVars += { "L5CallbackTime", "60000" }; -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", + +Paths = { + ".", }; + +// ---- service NeL variables (used by CVariable class) + +// ---- service custom variables (used by ConfigFile class) + +// Use Shard Unifier or not +DontUseSU = 0; + HomeMainlandNames = { "302", "Open", "open", }; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; +// The max number of ring points (aka ring access) for each ecosystem +MaxRingPoints = "A1:D7:F7:J8:L6:R13"; -Paths = { - ".", -}; + // ---- service custom variables (used by CVariable class) diff --git a/code/ryzom/server/session_browser_server_default.cfg b/code/ryzom/server/session_browser_server_default.cfg new file mode 100644 index 000000000..e31baddc5 --- /dev/null +++ b/code/ryzom/server/session_browser_server_default.cfg @@ -0,0 +1 @@ +#include "common.cfg" diff --git a/code/ryzom/server/shard_unifier_service.cfg b/code/ryzom/server/shard_unifier_service.cfg index 2249509b0..4e0cab244 100644 --- a/code/ryzom/server/shard_unifier_service.cfg +++ b/code/ryzom/server/shard_unifier_service.cfg @@ -1,277 +1,16 @@ // Use with commandline: shard_unifier_service -C. -L. --nobreak --writepid -AESAliasName= "su"; - -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; -SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; -SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; - -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; - -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; - -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; - -// Number of seconds between 2 logs to file -PDLogUpdate = 10; - -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; - -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" -}; - -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; +// ---- config local variables -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; - -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; - -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; - -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; - -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; - -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; - -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; - -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; +SUGlobalPort = 50503; -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; +#include "sql.cfg" -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; +#include "shard_unifier_service_default.cfg" -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; +// ---- service NeL variables (used by ConfigFile class) -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -#include "shard_unifier_service_default.cfg" +AESAliasName= "su"; // Create a command executor StartCommands += @@ -279,6 +18,7 @@ StartCommands += "moduleManager.createModule CommandExecutor ce", "ce.plug gw", }; + GraphVars += { "TotalConcurentUser", "60000" }; GraphVars += { "NetSpeedLoop", "0" }; GraphVars += { "NetSpeedLoop", "60000" }; @@ -286,26 +26,28 @@ GraphVars += { "L5CallbackCount", "0" }; GraphVars += { "L5CallbackCount", "60000" }; GraphVars += { "L5CallbackTime", "0" }; GraphVars += { "L5CallbackTime", "60000" }; -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", + +Paths = { + ".", }; + +// ---- service NeL variables (used by CVariable class) + +// ---- service custom variables (used by ConfigFile class) + +// Use Shard Unifier or not +DontUseSU = 0; + HomeMainlandNames = { -"302", "Open", "open", +"302", "Open", "open", }; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; -DontUseAES=1; -RingRPEnabled=0; + // ---- service custom variables (used by CVariable class) + DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; -Paths = { - ".", -}; +// The privileges needed to access any ring session +PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; + +#include "backup_service_interface.cfg" diff --git a/code/ryzom/server/shard_unifier_service_default.cfg b/code/ryzom/server/shard_unifier_service_default.cfg index e022cc4fb..a9a1923e8 100644 --- a/code/ryzom/server/shard_unifier_service_default.cfg +++ b/code/ryzom/server/shard_unifier_service_default.cfg @@ -1,11 +1,7 @@ #include "common.cfg" -NSHost = SUNSHost; -DontUseNS = SUDontUseNS; - -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; - +DontUseNS = 1; + StartCommands += { // Create a gateway for global interconnection diff --git a/code/ryzom/server/sql.cfg b/code/ryzom/server/sql.cfg new file mode 100644 index 000000000..e782d7618 --- /dev/null +++ b/code/ryzom/server/sql.cfg @@ -0,0 +1,14 @@ +DBHost = "localhost"; +DBNelName = "nel"; +DBRingName = "ring_open"; +// Nel DB user +DBNelUser = "shard"; +// Ring DB user +DBRingUser = "shard"; +// SU - password to access to the nel database with DBNelUseruser (default is no password) +DBNelPass = ""; +// SU - password to access to the ring database with DBRingUser (default is no password) +DBRingPass = ""; + +// MySQL wrapper strict mode - controls use of asserts if SQL requests fail +MSWStrictMode=0; diff --git a/code/ryzom/server/tick_service.cfg b/code/ryzom/server/tick_service.cfg index 13667e844..3c9aef8af 100644 --- a/code/ryzom/server/tick_service.cfg +++ b/code/ryzom/server/tick_service.cfg @@ -1,300 +1,30 @@ // Use with commandline: tick_service -C. -L. --nobreak --writepid -AESAliasName= "ts"; - -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; -SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; -SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; - -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; +#include "tick_service_default.cfg" -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; +// ---- config local variables -// Number of seconds between 2 logs to file -PDLogUpdate = 10; +// ---- service NeL variables (used by ConfigFile class) -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; +AESAliasName= "ts"; -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" +Paths = { + ".", + "../common/data_common", + "../common/data_leveldesign", }; -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - - -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - -// Use Shard Unifier or not -DontUseSU = 0; +// ---- service NeL variables (used by CVariable class) -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; - -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; - -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; - -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; - -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; - -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; - -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; - -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- -// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) -DontUseLSService = 1; - -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; - -// Set a mainland SessionId. -// Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards -// Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; -FixedSessionId = ShardId; +// ---- service custom variables (used by ConfigFile class) // Mirror limits DatasetSizefe_temp = 600000; DatasetSizefame = 26000; -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; + // ---- service custom variables (used by CVariable class) -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; - -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; - -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -#include "tick_service_default.cfg" - -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; - -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; +// Disable ryzom verbose logging +VerboseMIRROR = 0; -Paths = { - ".", - "../common/data_common", - "../common/data_leveldesign", -}; +#include "backup_service_interface.cfg" diff --git a/code/ryzom/server/used_continents.cfg b/code/ryzom/server/used_continents.cfg new file mode 100644 index 000000000..d8055753b --- /dev/null +++ b/code/ryzom/server/used_continents.cfg @@ -0,0 +1,14 @@ +// This is the mapping for logical continent to physical one (server_share/used_continent.cpp) +ContinentNameTranslator = +{ + "matis_newbie", "matis", + "zorai_newbie", "zorai", + "terre", "terre_oubliee", + "sources", "sources_interdites" +}; + +// This is the list of continent to use with their unique instance number (server_share/used_continent.cpp) +UsedContinents = +{ + "newbieland", "20", +}; diff --git a/code/ryzom/server/welcome_service.cfg b/code/ryzom/server/welcome_service.cfg index 9d2d97da6..21b48f3e3 100644 --- a/code/ryzom/server/welcome_service.cfg +++ b/code/ryzom/server/welcome_service.cfg @@ -1,298 +1,34 @@ // Use with commandline: ryzom_welcome_service -C. -L. --nobreak --writepid -AESAliasName= "rws"; -ASWebPort="46700"; -ASPort="46701"; -AESPort="46702"; +// ---- config local variables + SUPort = 50505; -SUGlobalPort = 50503; -L3BSPort = "49950"; -L3MasterLGSPort = 41292; -L3SlaveLGSPort = 49993; -LGSBSPort = 49990; -L3LGSBSPort = 49990; -LGSL3Port = L3MasterLGSPort; SUHost = "localhost"; -MFSHost = "localhost"; -BSHost = "localhost:49990"; -MasterLGSHost = "localhost"; -SlaveLGSHost = "localhost"; -LGSBSHost = "localhost"; -DBHost = "localhost"; -#define DONT_USE_LGS_SLAVE -// Configure module gateway for layer 5 module comm -StartCommands += -{ - // Create a gateway module - "moduleManager.createModule StandardGateway gw", - // add a layer 5 transport - "gw.transportAdd L5Transport l5", - // open the transport - "gw.transportCmd l5(open)", - - /// Create default connection with admin executor service - // Create a gateway module - "moduleManager.createModule StandardGateway gw_aes", - // create the admin executor service module - "moduleManager.createModule AdminExecutorServiceClient aes_client", - "aes_client.plug gw_aes", - - // create a layer 3 client to connect to aes gateway - "gw_aes.transportAdd L3Client aes_l3c", - "gw_aes.transportCmd aes_l3c(connect addr=localhost:"+AESPort+")", -}; - -/// A list of vars to graph for any service -GraphVars = -{ - "ProcessUsedMemory", "60000", // every minute -}; - - -/* Force default value for PDLib directory (e.g. SaveFilesDirectory...) - * PLEASE NOTICE THAT THIS LINE MUST BE LEFT TO "" - * Only log analyser must have the $shard parameter to find all shards root directory - */ -PDRootDirectory = ""; - -// Log PD updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableLog = 1; +// SU - listen address of the SU service (for L5 connections) +SUAddress = SUHost+":"+SUPort; -// Log PD StringManager updates to log file (1 enabled, 0 disabled), see PDLogSaveDirectory to choose where to log -PDEnableStringLog = 0; +#include "welcome_service_default.cfg" -// Number of seconds between 2 logs to file -PDLogUpdate = 10; +// ---- service NeL variables (used by ConfigFile class) -// MySGL wrapper strict mode - controls use of asserts if SQL requests fail -MSWStrictMode=0; +AESAliasName= "rws"; -// This is the mapping for logical continent to physical one -ContinentNameTranslator = -{ - "matis_newbie", "matis", - "zorai_newbie", "zorai", - "terre", "terre_oubliee", - "sources", "sources_interdites" +Paths = { + ".", }; -// Block the system in the tick service that provokes stalls when overloaded -WaitForBSThreshold=0; - +// ---- service NeL variables (used by CVariable class) -IgnoredFiles = { "continent.cfg", "__read_me.txt", "bandit.html", "flora_primr.primitive" }; - -// If the update loop is too slow, a thread will produce an assertion. -// By default, the value is set to 10 minutes. -// Set to 0 for no assertion. -UpdateAssertionThreadTimeout = 6000000; - -DefaultMaxExpectedBlockSize = 200000000; // 200 M ! -DefaultMaxSentBlockSize = 200000000; // 200 M ! - -// MS Packet size limit in bytes, PER DATASET (warning: depending on the weights, limits per property may be very small) -MaxOutBandwidth = 100000000; - -// how to sleep between 2 network updates -// 0 = pipe -// 1 = usleep -// 2 = nanosleep -// 3 = sched_yield -// 4 = nothing -UseYieldMethod = 0; - -// The privileges needed to access any ring session -PrivilegeForSessionAccess = ":DEV:SGM:GM:SG:"; - -// The max number of ring points (aka ring access) for each ecosystem -MaxRingPoints = "A1:D7:F7:J8:L6:R13"; - -// Level limit for newb scenarios -FreeTrialSkillLimit=21; - -// Level limit for newb scenarios -DefaultInterShardExchangeLevelCap=0; - -// Configureation for DSS -MaxNpcs = 300; -MaxStaticObjects = 200; - -// the following variable must be defined but should be empty - it's presence is used to change the behaviour -// of the packed sheet reader -GeorgePaths = { "" }; - -// Disable nel net verbose logging -VerboseNETTC = 0; -VerboseLNETL0 = 0; -VerboseLNETL1 = 0; -VerboseLNETL2 = 0; -VerboseLNETL3 = 0; -VerboseLNETL4 = 0; -VerboseLNETL5 = 0; -VerboseLNETL6 = 0; - -// Disable ryzom verbose logging -VerboseMIRROR = 0; -VerboseRingRPLog = 0; -VerboseCDBGroup = 0; - -// What to do with characters coming from another mainland shard? -// 0: teleport to the stored session id -// 1: let the character play anyway, but leave the stored session id unchanged -// 2: assign the stored session id with FixedSessionId and let play -AllowCharsFromAllSessions = 0; - -// Use Shard Unifier or not -DontUseSU = 0; - -// the domain's set of useful addresses -LSHost = SUHost; -RSMHost = SUHost; +// ---- service custom variables (used by ConfigFile class) -// MFS config -WebSrvUsersDirectory = ""; -WebRootDirectory = "save_shard/www"; -HoFHDTDirectory = "/local/www/hof/hdt"; - -// BS Specifics -------------------------------------------------------------------------- -// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed -// to other services by the Layer 5, i.e. the services sending requests to BS have -// to know its/their address(es) by another mean) -BSDontUseNS = 1; -// BS - set the host of the naming service where the BS register -BSNSHost = "localhost"; -UseBS = 1; -XMLSave = 0; - -// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot -SaveFilesDirectory = ""; - -// where to save generic shard data (ie: packed_sheet) -WriteFilesDirectory = "data_shard"; - -// Will SaveFilesDirectory will be converted to a full path? -ConvertSaveFilesDirectoryToFullPath = 0; - -// BS - Root directory where data are backuped to -IncrementalBackupDirectory = "../incremental_backup"; - -// IOS - Directory to store ios.string_cache file -StringManagerCacheDirectory = "data_shard_local"; - -// IOS - Directory to log chat into -LogChatDirectory = "data_shard_local"; - -// MFS - Directories -WebRootDirectory = "../www"; - -// Root directory where data from shards are stored into -SaveShardRoot = "save_shard/"; - -// SU Specifics -------------------------------------------------------------------------- -// SU - set to 1 if SU didn't use a naming service -SUDontUseNS = 1; -// SU - host for the NS used by SU -SUNSHost = "localhost"; -// SU - listen address of the SU service (for L5 connections) -SUAddress = SUHost+":"+SUPort; -// SU - nel and ring database names -DBNelName = "nel"; -DBRingName = "ring_open"; -// Nel DB user -DBNelUser = "shard"; -// Ring DB user -DBRingUser = "shard"; -// SU - password to access to the nel database with DBNelUseruser (default is no password) -DBNelPass = ""; -// SU - password to access to the ring database with DBRingUser (default is no password) -DBRingPass = ""; - -// WS Specifics -------------------------------------------------------------------------- // WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring) DontUseLSService = 1; -// Global config -------------------------------------------------------------------------- -// set to 0 if you want to use the admin system -DontUseAES = 1; - -// Disable generation / display of nldebug messages -DisableNLDebug = 1; -FSListenHost = "localhost"; -DBPass=""; -ShardId = 302; -BasePort = 51000; -SaveFilesDirectory=""; -NSHost = "localhost"; -// Player limits (AIS, EGS, WS, FS) -NbPlayersLimit = 5000; -NbGuildLimit = 15000; -PlayerLimit = NbPlayersLimit; -ClientLimit = 1000; - -// Set this shard as a ring (1) or mainland (0) shard (main behavior switch) -IsRingShard = 0; +LSHost = SUHost; // Set a mainland SessionId. // Live: Must be 0 for ring shards, non-zero (usually ShardId) for mainland shards // Dev: Can be non-zero to initially connect a client to a ring shard -NoWSShardId = ShardId; FixedSessionId = ShardId; -// Mirror limits -DatasetSizefe_temp = 600000; -DatasetSizefame = 26000; - -// FS Specifics -------------------------------------------------------------------------- -// Client bandwidth ratio, set to 1 for standard opration, more than one allocate more bandwidth -BandwidthRatio = 1; - -// EGS Specifics -------------------------------------------------------------------------- -// Entity Limits (EGS) -NbObjectsLimit = 2000; -NbNpcSpawnedByEGSLimit = 5000; -NbForageSourcesLimit = 10000; -NbToxicCloudsLimit = 5000; - -// AIS Specifics -------------------------------------------------------------------------- -// Entity Limits (AIS) -NbPetLimit = NbPlayersLimit*4; -NbFaunaLimit = 50000; -NbNpcLimit = 20000; -NbFxLimit = 500; - -// This is the list of continent to use with their unique instance number -UsedContinents = -{ - "newbieland", "20", -}; - -// define the primitives configuration used. -UsedPrimitives = -{ - "newbieland_all", -}; -#include "welcome_service_default.cfg" - -Mainlands = { -"302", "Open", "(Open Developer Community)", "en", -}; -HomeMainlandNames = -{ -"302", "Open", "open", -}; -RRDVarPath = "save_shard/rrd_graphs"; -ReadTranslationWork = 1; -TranslationWorkPath = ""; - -DontUseAES=1; -RingRPEnabled=0; -DomainName = "ryzom_open"; -EnableStlAllocatorChecker = 0; -// start commands for setting up the exchange level caps of different ryzom shards -StartCommands += { "setShardExchangeLimit 301 250" }; -StartCommands += { "displayShardExchangeLimits" }; -StartCommands += { "EnableStlAllocatorChecker 0" }; - -Paths = { - ".", -}; + // ---- service custom variables (used by CVariable class)