From af758ea16456a47832cc823465819fc4f9576c77 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 14:01:47 -0800 Subject: * More config cleanup * Added different ports (8002 and 8003) to the many services in OpenSim.Server.ini.example * Added a separate OpenSim.Server.HG.ini.example to make it easier to run --- bin/OpenSim.Server.HG.ini | 44 ---------- bin/OpenSim.Server.HG.ini.example | 173 ++++++++++++++++++++++++++++++++++++++ bin/OpenSim.Server.ini.example | 3 - bin/OpenSim.ini.example | 50 ----------- 4 files changed, 173 insertions(+), 97 deletions(-) delete mode 100644 bin/OpenSim.Server.HG.ini create mode 100644 bin/OpenSim.Server.HG.ini.example (limited to 'bin') diff --git a/bin/OpenSim.Server.HG.ini b/bin/OpenSim.Server.HG.ini deleted file mode 100644 index 2ec4957..0000000 --- a/bin/OpenSim.Server.HG.ini +++ /dev/null @@ -1,44 +0,0 @@ -;; Extra configurations for enabling HG1.5 - -;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService -;; OpenSim.Server.Handlers.dll:UserAgentService -;; OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector - -ServiceConnectors = "8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector" - -[LoginService] - UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" - ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) - ; CHANGE THIS - HomeURI = "http://127.0.0.1:8002" - GatekeeperURI = "http://127.0.0.1:8002" - InventoryServerURI = "http://127.0.0.1:8002" - AssetServerURI = "http://127.0.0.1:8002" - -[GatekeeperService] - LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" - ;; for the service - UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" - UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" - PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" - GridService = "OpenSim.Services.GridService.dll:GridService" - AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" - SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" - ; how does the outside world reach me? This acts as public key too. - ; CHANGE THIS - ExternalName = "http://127.0.0.1:8002" - -[UserAgentService] - LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" - ;; for the service - PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" - GridService = "OpenSim.Services.GridService.dll:GridService" - -;; The interface that local users get when they are in other grids. -;; This restricts the inventory operations while in other grids. -;; Still not completely safe, especially if users perform inventory operations -;; while in those grids. The more the user accesses his/her inventory, the more -;; those simulators will know about the user's inventory. -[HGInventoryService] - ; For the InventoryServiceInConnector - LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example new file mode 100644 index 0000000..7c1ccef --- /dev/null +++ b/bin/OpenSim.Server.HG.ini.example @@ -0,0 +1,173 @@ +;; Configurations for enabling HG1.5 +;; +;; Run +;; $ OpenSim.Server.exe -inifile OpenSim.Server.HG.ini + +;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService +;; OpenSim.Server.Handlers.dll:UserAgentService +;; OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector +;; +;; Note that we're putting the asset service in 8002. +;; Make sure your simulators point to that. + +[Startup] +ServiceConnectors = "8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector" + +; * This is common for all services, it's the network setup for the entire +; * server instance, if none if specified above +; * +[Network] + port = 8003 + +; * The following are for the remote console +; * They have no effect for the local or basic console types +; * Leave commented to diable logins to the console +;ConsoleUser = Test +;ConsolePass = secret +;ConsolePort = 0 + +; * As an example, the below configuration precisely mimicks the legacy +; * asset server. It is read by the asset IN connector (defined above) +; * and it then loads the OUT connector (a local database module). That, +; * in turn, reads the asset loader and database connection information +; * +[AssetService] + LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" + DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" + AssetLoaderArgs = "assets/AssetSets.xml" + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + +; * This configuration loads the inventory server modules. It duplicates +; * the function of the legacy inventory server +; * +[InventoryService] + LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" + SessionAuthentication = "false" + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + +; * This is the new style grid service. +; * "Realm" is the table that is used for user lookup. +; * It defaults to "regions", which uses the legacy tables +; * +[GridService] + LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" + StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + Realm = "regions" + ; AllowDuplicateNames = "True" + ;; Next, we can specify properties of regions, including default and fallback regions + ;; The syntax is: Region_ = "" + ;; or: Region_ = "" + ;; where can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate + ;; For example: + ; Region_Welcome_Area = "DefaultRegion, FallbackRegion" + ; (replace spaces with underscore) + +; * This is the configuration for the freeswitch server in grid mode +[FreeswitchService] + LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" + +; * This is the new style authentication service. Currently, only MySQL +; * is implemented. "Realm" is the table that is used for user lookup. +; * By setting it to "users", you can use the old style users table +; * as an authentication source. +; * +[AuthenticationService] + ; for the server connector + LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" + ; for the service + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + +[OpenIdService] + ; for the server connector + AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" + UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" + +; * This is the new style user service. +; * "Realm" is the table that is used for user lookup. +; * It defaults to "users", which uses the legacy tables +; * +[UserAccountService] + ; for the server connector + LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" + ; for the service + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + ; Realm = "useraccounts" + ;; These are for creating new accounts by the service + AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" + PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" + GridService = "OpenSim.Services.GridService.dll:GridService" + InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" + +[PresenceService] + ; for the server connector + LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" + ; for the service + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + +[AvatarService] + ; for the server connector + LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" + ; for the service + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + +[LibraryService] + LibraryName = "OpenSim Library" + DefaultLibrary = "./inventory/Libraries.xml" + +[LoginService] + ; for the server connector + LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService" + ; for the service + UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" + AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" + InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" + AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" + PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" + GridService = "OpenSim.Services.GridService.dll:GridService" + SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" + LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" + UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" + + DefaultRegion = "OpenSim Test" + WelcomeMessage = "Welcome, Avatar!" + ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) + ; CHANGE THIS + HomeURI = "http://127.0.0.1:8002" + GatekeeperURI = "http://127.0.0.1:8002" + InventoryServerURI = "http://127.0.0.1:8002" + AssetServerURI = "http://127.0.0.1:8002" + +[GatekeeperService] + LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" + ;; for the service + UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService" + UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" + PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" + GridService = "OpenSim.Services.GridService.dll:GridService" + AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" + SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" + ; how does the outside world reach me? This acts as public key too. + ; CHANGE THIS + ExternalName = "http://127.0.0.1:8002" + +[UserAgentService] + LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" + ;; for the service + PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" + GridService = "OpenSim.Services.GridService.dll:GridService" + +;; The interface that local users get when they are in other grids. +;; This restricts the inventory operations while in other grids. +;; Still not completely safe, especially if users perform inventory operations +;; while in those grids. The more the user accesses his/her inventory, the more +;; those simulators will know about the user's inventory. +[HGInventoryService] + ; For the InventoryServiceInConnector + LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index ee9e661..6912d88 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -137,6 +137,3 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 DefaultRegion = "OpenSim Test" WelcomeMessage = "Welcome, Avatar!" -;; Uncomment if you want your grid to become Hypergrid-enabled -;;[Hypergrid] -;; Include-Hypergrid = "OpenSim.Server.HG.ini" diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 70f03a1..6cb3f02 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -267,56 +267,6 @@ ;SMTP_SERVER_LOGIN=foo ;SMTP_SERVER_PASSWORD=bar - -[Communications] - ;InterregionComms = "LocalComms" - InterregionComms = "RESTComms" - - -[StandAlone] - ; If this is set to true then OpenSim only allows in users who already have accounts. - ; An account can be created using the "create user" console command. - ; - ; If this is set to false then an account is automatically created for a user who logs in - ; without one. PLEASE NOTE THAT IN THIS MODE NO PASSWORD CHECKS ARE PERFORMED. - ; Therefore, any user can log into any account. If accounts_authenticate is later switched to - ; true then the passwords will need to be reset (using the "reset user password" console command) since - ; automatically created accounts have their password set to the string "test". - ; - ; This setting applies to standalone mode only, not grid or other modes. Default is true. - accounts_authenticate = true - - welcome_message = "Welcome to OpenSimulator" - - ; Inventory database provider - inventory_plugin = "OpenSim.Data.SQLite.dll" - ; inventory_plugin = "OpenSim.Data.MySQL.dll" - - ; Inventory source SQLite example - inventory_source = "URI=file:inventoryStore.db,version=3" - ; Inventory Source MySQL example - ;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" - - ; User Data Database provider - ; - ; Multiple providers can be specified by separating them with commas (whitespace is unimportant) - ; If multiple providers are specified then if a profile is requested, each is queried until one - ; provides a valid profile, or until all providers have been queried. - ; Unfortunately the order of querying is currently undefined (it may not be the order in which - ; providers are specified here). This needs to be fixed - ; - userDatabase_plugin = "OpenSim.Data.SQLite.dll" - ; userDatabase_plugin = "OpenSim.Data.MySQL.dll" - - ; User source SQLite example - user_source = "URI=file:userprofiles.db,version=3" - ; User Source MySQL example - ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;" - - ; Specifies the location and filename of the default inventory library control file. The path can be relative or absolute - ; Default is ./inventory/Libraries.xml - LibrariesXMLFile="./inventory/Libraries.xml" - [Network] ConsoleUser = "Test" ConsolePass = "secret" -- cgit v1.1