aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2010-11-25 11:14:16 -0800
committerDiva Canto2010-11-25 11:14:16 -0800
commitae4b02e1152b775dc1cdccd1abfbff44ab1a8949 (patch)
treed0b89d3bf8f3256a3043c2d21bd7a22cb23891c0 /bin
parentAttempt at fixing failing test. (diff)
downloadopensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.zip
opensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.tar.gz
opensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.tar.bz2
opensim-SC_OLD-ae4b02e1152b775dc1cdccd1abfbff44ab1a8949.tar.xz
WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.
Diffstat (limited to '')
-rw-r--r--bin/Robust.HG.ini.example29
-rw-r--r--bin/config-include/StandaloneCommon.ini.example16
-rw-r--r--bin/config-include/StandaloneHypergrid.ini8
3 files changed, 40 insertions, 13 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index e1627c0..dbac73b 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -21,7 +21,7 @@
21; * [[<ConfigName>@]<port>/]<dll name>[:<class name>] 21; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
22; * 22; *
23[Startup] 23[Startup]
24ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,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,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector" 24ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,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,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector"
25 25
26; * This is common for all services, it's the network setup for the entire 26; * This is common for all services, it's the network setup for the entire
27; * server instance, if none if specified above 27; * server instance, if none if specified above
@@ -154,10 +154,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
154 154
155 ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) 155 ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
156 ; CHANGE THIS 156 ; CHANGE THIS
157 HomeURI = "http://127.0.0.1:8002" 157 GatekeeperURI = "http://127.0.0.1:8002"
158 GatekeeperURI = "http://127.0.0.1:8002" 158
159 InventoryServerURI = "http://127.0.0.1:8002" 159 SRV_HomeURI = "http://127.0.0.1:8002"
160 AssetServerURI = "http://127.0.0.1:8002" 160 SRV_InventoryServerURI = "http://127.0.0.1:8002"
161 SRV_AssetServerURI = "http://127.0.0.1:8002"
162 SRV_ProfileServerURI = "http://127.0.0.1:8002"
161 163
162[GridInfoService] 164[GridInfoService]
163 ; These settings are used to return information on a get_grid_info call. 165 ; These settings are used to return information on a get_grid_info call.
@@ -169,7 +171,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
169 ; See http://opensimulator.org/wiki/GridInfo 171 ; See http://opensimulator.org/wiki/GridInfo
170 172
171 ; login uri: for grid this is the login server URI 173 ; login uri: for grid this is the login server URI
172 login = http://127.0.0.1:9000/ 174 login = http://127.0.0.1:8002/
173 175
174 ; long grid name: the long name of your grid 176 ; long grid name: the long name of your grid
175 gridname = "the lost continent of hippo" 177 gridname = "the lost continent of hippo"
@@ -183,7 +185,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
183 185
184 ; helper uri: optional: if it exists if will be used to tell the client to use 186 ; helper uri: optional: if it exists if will be used to tell the client to use
185 ; this for all economy related things 187 ; this for all economy related things
186 ;economy = http://127.0.0.1:9000/ 188 ;economy = http://127.0.0.1:8002/
187 189
188 ; web page of grid: optional: page providing further information about your grid 190 ; web page of grid: optional: page providing further information about your grid
189 ;about = http://127.0.0.1/about/ 191 ;about = http://127.0.0.1/about/
@@ -241,4 +243,15 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
241; * 243; *
242[HGInventoryService] 244[HGInventoryService]
243 ; For the InventoryServiceInConnector 245 ; For the InventoryServiceInConnector
244 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" 246 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"
247 UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
248 ProfileServerURI = "http://127.0.0.1:8002/user"
249
250; * The interface that local users get when they are in other grids.
251; * This restricts the access that the rest of the world has to
252; * the assets of this world.
253; *
254[HGAssetService]
255 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
256 UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
257 ProfileServerURI = "http://127.0.0.1:8002/user"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 1fcf043..d002d49 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -25,6 +25,13 @@
25 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 25 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
26 AssetLoaderArgs = "assets/AssetSets.xml" 26 AssetLoaderArgs = "assets/AssetSets.xml"
27 27
28[HGInventoryService]
29 ProfileServerURI = "http://127.0.0.1:9000/profiles"
30
31[HGAssetService]
32 ProfileServerURI = "http://127.0.0.1:9000/profiles"
33
34
28[Modules] 35[Modules]
29 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 36 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
30 ;; Copy the config .example file into your own .ini file and change configs there 37 ;; Copy the config .example file into your own .ini file and change configs there
@@ -68,11 +75,12 @@
68 75
69[LoginService] 76[LoginService]
70 WelcomeMessage = "Welcome, Avatar!" 77 WelcomeMessage = "Welcome, Avatar!"
71
72 HomeURI = "http://127.0.0.1:9000"
73 GatekeeperURI = "http://127.0.0.1:9000" 78 GatekeeperURI = "http://127.0.0.1:9000"
74 InventoryServerURI = "http://127.0.0.1:9000" 79
75 AssetServerURI = "http://127.0.0.1:9000" 80 SRV_HomeURI = "http://127.0.0.1:9000"
81 SRV_InventoryServerURI = "http://127.0.0.1:9000"
82 SRV_AssetServerURI = "http://127.0.0.1:9000"
83 SRV_ProfileServerURI = "http://127.0.0.1:9000"
76 84
77[GatekeeperService] 85[GatekeeperService]
78 ExternalName = "http://127.0.0.1:9000" 86 ExternalName = "http://127.0.0.1:9000"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index f164d33..68aa739 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -128,8 +128,14 @@
128;; This greatly restricts the inventory operations while in other grids 128;; This greatly restricts the inventory operations while in other grids
129[HGInventoryService] 129[HGInventoryService]
130 ; For the InventoryServiceInConnector 130 ; For the InventoryServiceInConnector
131 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" 131 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"
132 UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
132 133
134;; The interface that local users get when they are in other grids
135;; This restricts/filters the asset operations from the outside
136[HGAssetService]
137 LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
138 UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
133 139
134;; This should always be the very last thing on this file 140;; This should always be the very last thing on this file
135[Includes] 141[Includes]