aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.Server.ini.example39
-rw-r--r--bin/OpenSim.ini.example39
-rw-r--r--bin/config-include/Grid.ini1
-rw-r--r--bin/config-include/GridHypergrid.ini5
-rw-r--r--bin/config-include/StandaloneHypergrid.ini3
5 files changed, 11 insertions, 76 deletions
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 @@
11; * 11; *
12[Startup] 12[Startup]
13 13
14;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService,OpenSim.Server.Handlers.dll:UserAgentService 14ServiceConnectors = "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"
15
16ServiceConnectors = "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"
17 15
18; * This is common for all services, it's the network setup for the entire 16; * This is common for all services, it's the network setup for the entire
19; * server instance 17; * server instance, if none if specified above
20; * 18; *
21[Network] 19;[Network]
22 port = 8003 20; port = 8003
23 21
24; * The following are for the remote console 22; * The following are for the remote console
25; * They have no effect for the local or basic console types 23; * They have no effect for the local or basic console types
@@ -135,33 +133,10 @@ ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector,OpenSim.S
135 GridService = "OpenSim.Services.GridService.dll:GridService" 133 GridService = "OpenSim.Services.GridService.dll:GridService"
136 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" 134 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
137 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" 135 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
138 ; Do you let your users go outside this grid? If so, use this
139 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
140 136
141 DefaultRegion = "OpenSim Test" 137 DefaultRegion = "OpenSim Test"
142 WelcomeMessage = "Welcome, Avatar!" 138 WelcomeMessage = "Welcome, Avatar!"
143 HomeURI = "http://127.0.0.1:8003"
144 GatekeeperURI = "http://127.0.0.1:8003"
145 InventoryServerURI = "http://127.0.0.1:8003"
146 AssetServerURI = "http://127.0.0.1:8003"
147
148;; These 2 are for enabling HG1.5
149
150[GatekeeperService]
151 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
152 ;; for the service
153 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
154 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
155 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
156 GridService = "OpenSim.Services.GridService.dll:GridService"
157 AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
158 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
159 ; how does the outside world reach me? This acts as public key too.
160 ExternalName = "http://127.0.0.1:8003"
161 139
162[UserAgentService] 140;; Uncomment if you want your grid to become Hypergrid-enabled
163 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" 141;;[Hypergrid]
164 ;; for the service 142;; Include-Hypergrid = "OpenSim.Server.HG.ini"
165 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
166 GridService = "OpenSim.Services.GridService.dll:GridService"
167
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 @@
19 ; inside your firewall, separate patterns with a ';' 19 ; inside your firewall, separate patterns with a ';'
20 ; HttpProxyExceptions = ".mydomain.com;localhost" 20 ; HttpProxyExceptions = ".mydomain.com;localhost"
21 21
22 ; Set this to true if you are connecting your regions to a grid
23 ; Set this to false if you are running in standalone mode
24 gridmode = false
25
26 ; Set this to true if you want Hypergrid functionality
27 hypergrid = false
28
29 startup_console_commands_file = "startup_commands.txt" 22 startup_console_commands_file = "startup_commands.txt"
30 shutdown_console_commands_file = "shutdown_commands.txt" 23 shutdown_console_commands_file = "shutdown_commands.txt"
31 24
@@ -118,7 +111,7 @@
118 ;InworldRestartShutsDown = false 111 ;InworldRestartShutsDown = false
119 112
120 ; ## 113 ; ##
121 ; ## STORAGE 114 ; ## PRIM STORAGE
122 ; ## 115 ; ##
123 116
124 ; *** Prim Storage - only leave one storage_plugin uncommented *** 117 ; *** Prim Storage - only leave one storage_plugin uncommented ***
@@ -134,7 +127,7 @@
134 ; --- To use MySQL storage, supply your own connection string (this is only an example): 127 ; --- To use MySQL storage, supply your own connection string (this is only an example):
135 ; note that the supplied account needs create privilegies if you want it to auto-create needed tables. 128 ; note that the supplied account needs create privilegies if you want it to auto-create needed tables.
136 ; 129 ;
137 ; -->>> There are multiple connection strings defined in several places in this file. Check it carefully! 130 ; -->>> There are multiple connection strings defined in several places. Check it carefully!
138 ; 131 ;
139 ; storage_plugin="OpenSim.Data.MySQL.dll" 132 ; storage_plugin="OpenSim.Data.MySQL.dll"
140 ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; 133 ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
@@ -142,15 +135,6 @@
142 ; uncomment and change this connect string. Defaults to the above if not set 135 ; uncomment and change this connect string. Defaults to the above if not set
143 ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;"; 136 ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
144 137
145 ; Select whether you want to use local or grid asset storage.
146 ;
147 ; If you're running in standalone, you definitely want local, since there is no grid (hence this is redundant, and should
148 ; really be eliminated). The database itself is defined in asset_plugin below
149 ;
150 ; If you're running a region server connecting to a grid, you probably want grid mode, since this will use the
151 ; grid asset server. If you select local in grid mode, then you will use a database as specified in asset_plugin to store assets
152 ; locally. This will mean you won't be able to take items using your assets to other people's regions.
153
154 ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to 138 ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to
155 ; prevent frequently changing objects from heavily loading the region data store. 139 ; prevent frequently changing objects from heavily loading the region data store.
156 ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep. 140 ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep.
@@ -338,8 +322,6 @@
338 ConsolePass = "secret" 322 ConsolePass = "secret"
339 http_listener_port = 9000 323 http_listener_port = 9000
340 console_port = 0 324 console_port = 0
341 default_location_x = 1000
342 default_location_y = 1000
343 325
344 ; ssl config: Experimental! The auto https config only really works definately on windows XP now 326 ; ssl config: Experimental! The auto https config only really works definately on windows XP now
345 ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below 327 ; you need a Cert Request/Signed pair installed in the MY store with the CN specified below
@@ -356,21 +338,6 @@
356 ; Uncomment below to enable llRemoteData/remote channels 338 ; Uncomment below to enable llRemoteData/remote channels
357 ; remoteDataPort = 20800 339 ; remoteDataPort = 20800
358 340
359 grid_server_url = "http://127.0.0.1:8003"
360 grid_send_key = "null"
361 grid_recv_key = "null"
362
363 user_server_url = "http://127.0.0.1:8002"
364 user_send_key = "null"
365 user_recv_key = "null"
366
367 asset_server_url = "http://127.0.0.1:8003"
368
369 inventory_server_url = "http://127.0.0.1:8003"
370
371 ; The MessagingServer is a companion of the UserServer. It uses
372 ; user_send_key and user_recv_key, too
373 messaging_server_url = "http://127.0.0.1:8006"
374 341
375 ; What is reported as the "X-Secondlife-Shard" 342 ; What is reported as the "X-Secondlife-Shard"
376 ; Defaults to the user server url if not set 343 ; Defaults to the user server url if not set
@@ -1360,7 +1327,7 @@
1360 1327
1361[GridService] 1328[GridService]
1362 ;; default standalone, overridable in StandaloneCommon.ini 1329 ;; default standalone, overridable in StandaloneCommon.ini
1363 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 1330 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
1364 1331
1365 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1332 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1366 ;; The following is the configuration section for the new style services 1333 ;; 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 @@
18 UserAccountServices = "RemoteUserAccountServicesConnector" 18 UserAccountServices = "RemoteUserAccountServicesConnector"
19 SimulationServices = "RemoteSimulationConnectorModule" 19 SimulationServices = "RemoteSimulationConnectorModule"
20 EntityTransferModule = "BasicEntityTransferModule" 20 EntityTransferModule = "BasicEntityTransferModule"
21 InventoryAccessModule = "BasicInventoryAccessModule"
21 LandServiceInConnector = true 22 LandServiceInConnector = true
22 NeighbourServiceInConnector = true 23 NeighbourServiceInConnector = true
23 SimulationServiceInConnector = true 24 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 @@
7[Includes] 7[Includes]
8 Include-Common = "config-include/GridCommon.ini" 8 Include-Common = "config-include/GridCommon.ini"
9 9
10[Startup]
11 hypergrid = true
12
13[Modules] 10[Modules]
14 AssetServices = "HGAssetBroker" 11 AssetServices = "HGAssetBroker"
15 InventoryServices = "HGInventoryBroker" 12 InventoryServices = "HGInventoryBroker"
@@ -27,8 +24,6 @@
27 NeighbourServiceInConnector = true 24 NeighbourServiceInConnector = true
28 SimulationServiceInConnector = true 25 SimulationServiceInConnector = true
29 LibraryModule = true 26 LibraryModule = true
30 InventoryServiceInConnector = false
31 AssetServiceInConnector = false
32 27
33[AssetService] 28[AssetService]
34 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" 29 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 @@
6 6
7[Includes] 7[Includes]
8 Include-Common = "config-include/StandaloneCommon.ini" 8 Include-Common = "config-include/StandaloneCommon.ini"
9
10[Startup]
11 hypergrid = true
12 9
13[Modules] 10[Modules]
14 AssetServices = "HGAssetBroker" 11 AssetServices = "HGAssetBroker"