From 041594ed075049f804fc157700a6d78e54194c0b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 13:01:23 -0800 Subject: Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs. --- bin/OpenSim.Server.ini.example | 39 ++++++------------------------ bin/OpenSim.ini.example | 39 +++--------------------------- bin/config-include/Grid.ini | 1 + bin/config-include/GridHypergrid.ini | 5 ---- bin/config-include/StandaloneHypergrid.ini | 3 --- 5 files changed, 11 insertions(+), 76 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example index 5d4927b..5def529 100644 --- a/bin/OpenSim.Server.ini.example +++ b/bin/OpenSim.Server.ini.example @@ -11,15 +11,13 @@ ; * [Startup] -;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService,OpenSim.Server.Handlers.dll:UserAgentService - -ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.Server.Handlers.dll:InventoryServiceInConnector,OpenSim.Server.Handlers.dll:FreeswitchServerConnector,OpenSim.Server.Handlers.dll:GridServiceConnector,OpenSim.Server.Handlers.dll:GridInfoServerInConnector,OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,OpenSim.Server.Handlers.dll:OpenIdServerConnector,OpenSim.Server.Handlers.dll:AvatarServiceConnector,OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,OpenSim.Server.Handlers.dll:PresenceServiceConnector,OpenSim.Server.Handlers.dll:UserAccountServiceConnector,OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,OpenSim.Server.Handlers.dll:UserAgentServerConnector" +ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/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" ; * This is common for all services, it's the network setup for the entire -; * server instance +; * server instance, if none if specified above ; * -[Network] - port = 8003 +;[Network] +; port = 8003 ; * The following are for the remote console ; * They have no effect for the local or basic console types @@ -135,33 +133,10 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S GridService = "OpenSim.Services.GridService.dll:GridService" SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" - ; Do you let your users go outside this grid? If so, use this - UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" DefaultRegion = "OpenSim Test" WelcomeMessage = "Welcome, Avatar!" - HomeURI = "http://127.0.0.1:8003" - GatekeeperURI = "http://127.0.0.1:8003" - InventoryServerURI = "http://127.0.0.1:8003" - AssetServerURI = "http://127.0.0.1:8003" - -;; These 2 are for enabling HG1.5 - -[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. - ExternalName = "http://127.0.0.1:8003" -[UserAgentService] - LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" - ;; for the service - PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" - GridService = "OpenSim.Services.GridService.dll:GridService" - +;; 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 3b560de..70f03a1 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -19,13 +19,6 @@ ; inside your firewall, separate patterns with a ';' ; HttpProxyExceptions = ".mydomain.com;localhost" - ; Set this to true if you are connecting your regions to a grid - ; Set this to false if you are running in standalone mode - gridmode = false - - ; Set this to true if you want Hypergrid functionality - hypergrid = false - startup_console_commands_file = "startup_commands.txt" shutdown_console_commands_file = "shutdown_commands.txt" @@ -118,7 +111,7 @@ ;InworldRestartShutsDown = false ; ## - ; ## STORAGE + ; ## PRIM STORAGE ; ## ; *** Prim Storage - only leave one storage_plugin uncommented *** @@ -134,7 +127,7 @@ ; --- To use MySQL storage, supply your own connection string (this is only an example): ; note that the supplied account needs create privilegies if you want it to auto-create needed tables. ; - ; -->>> There are multiple connection strings defined in several places in this file. Check it carefully! + ; -->>> There are multiple connection strings defined in several places. Check it carefully! ; ; storage_plugin="OpenSim.Data.MySQL.dll" ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; @@ -142,15 +135,6 @@ ; uncomment and change this connect string. Defaults to the above if not set ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; - ; Select whether you want to use local or grid asset storage. - ; - ; If you're running in standalone, you definitely want local, since there is no grid (hence this is redundant, and should - ; really be eliminated). The database itself is defined in asset_plugin below - ; - ; If you're running a region server connecting to a grid, you probably want grid mode, since this will use the - ; grid asset server. If you select local in grid mode, then you will use a database as specified in asset_plugin to store assets - ; locally. This will mean you won't be able to take items using your assets to other people's regions. - ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to ; prevent frequently changing objects from heavily loading the region data store. ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep. @@ -338,8 +322,6 @@ ConsolePass = "secret" http_listener_port = 9000 console_port = 0 - default_location_x = 1000 - default_location_y = 1000 ; ssl config: Experimental! The auto https config only really works definately on windows XP now ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below @@ -356,21 +338,6 @@ ; Uncomment below to enable llRemoteData/remote channels ; remoteDataPort = 20800 - grid_server_url = "http://127.0.0.1:8003" - grid_send_key = "null" - grid_recv_key = "null" - - user_server_url = "http://127.0.0.1:8002" - user_send_key = "null" - user_recv_key = "null" - - asset_server_url = "http://127.0.0.1:8003" - - inventory_server_url = "http://127.0.0.1:8003" - - ; The MessagingServer is a companion of the UserServer. It uses - ; user_send_key and user_recv_key, too - messaging_server_url = "http://127.0.0.1:8006" ; What is reported as the "X-Secondlife-Shard" ; Defaults to the user server url if not set @@ -1360,7 +1327,7 @@ [GridService] ;; default standalone, overridable in StandaloneCommon.ini - StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" + StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; The following is the configuration section for the new style services diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 5aae1bc..56c76c6 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -18,6 +18,7 @@ UserAccountServices = "RemoteUserAccountServicesConnector" SimulationServices = "RemoteSimulationConnectorModule" EntityTransferModule = "BasicEntityTransferModule" + InventoryAccessModule = "BasicInventoryAccessModule" LandServiceInConnector = true NeighbourServiceInConnector = true SimulationServiceInConnector = true diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 4d40766..7391278 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -7,9 +7,6 @@ [Includes] Include-Common = "config-include/GridCommon.ini" -[Startup] - hypergrid = true - [Modules] AssetServices = "HGAssetBroker" InventoryServices = "HGInventoryBroker" @@ -27,8 +24,6 @@ NeighbourServiceInConnector = true SimulationServiceInConnector = true LibraryModule = true - InventoryServiceInConnector = false - AssetServiceInConnector = false [AssetService] LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index f36b0c4..63ea832 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -6,9 +6,6 @@ [Includes] Include-Common = "config-include/StandaloneCommon.ini" - -[Startup] - hypergrid = true [Modules] AssetServices = "HGAssetBroker" -- cgit v1.1