From ae222140ca6984750f53716088b6df165d8a35e5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 26 Sep 2009 10:08:59 -0700
Subject: Finished spec-ing the .inis for the new grid service modules.

---
 bin/config-include/Grid.ini                     |  7 +++++++
 bin/config-include/GridCommon.ini.example       |  5 +++++
 bin/config-include/GridHypergrid.ini            | 11 ++++++++++-
 bin/config-include/Standalone.ini               |  3 +--
 bin/config-include/StandaloneCommon.ini.example |  7 +++++++
 bin/config-include/StandaloneHypergrid.ini      |  6 ++++--
 6 files changed, 34 insertions(+), 5 deletions(-)

(limited to 'bin/config-include')

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 10f7dbd..261c1b8 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -12,5 +12,12 @@
     InventoryServices = "RemoteInventoryServicesConnector"
     AuthorizationServices = "RemoteAuthorizationServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "RemoteGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
+
+[GridService]
+	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+	; for the LocalGridServicesConnector which is used by the Remote one
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    
\ No newline at end of file
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 3a8ec35..2724c42 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -15,6 +15,11 @@
     ;
     InventoryServerURI = "http://myinventoryserver.com:8004"
 
+[GridService]
+    ;
+    ; change this to your grid-wide inventory server
+    ;
+    GridServerURI = "http://mygridserver.com:8002"
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 8b65ab8..1bfcf89 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -11,9 +11,10 @@
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
     NeighbourServices = "RemoteNeighbourServicesConnector"
+    GridServices = "HGGridServicesConnector"
     NeighbourServiceInConnector = true
     LandServiceInConnector = true
-
+    HypergridServiceInConnector = true
 
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
@@ -22,3 +23,11 @@
 [InventoryService]
     LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
     HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+
+[GridService]
+    ; for the HGGridServicesConnector to instantiate
+	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector"
+	; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
+	; which in turn uses this
+	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 5a5cbff..a6c089c 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -25,5 +25,4 @@
 
 [GridService]
 	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-	
\ No newline at end of file
+    Realm = "regions"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bac7983..b0e2de3 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -32,3 +32,10 @@
 [FreeswitchService]
     ;; Configuration for the freeswitch service goes here
     LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
+
+[GridService]
+    ;; For in-memory region storage (default)
+	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    ;;--- For MySql region storage (alternative)
+ 	;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
+	;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index b14517d..793f4d5 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -42,6 +42,8 @@
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
     
 [GridService]
-	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    ; for the HGGridServicesConnector to instantiate
 	GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
-	StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
\ No newline at end of file
+	; LocalGridServicesConnector needs this
+	LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+	Realm = "regions"
-- 
cgit v1.1