aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.Grid.GridServer.addin.xml9
-rw-r--r--bin/OpenSim.Grid.GridServer.exe.config28
-rw-r--r--bin/OpenSim.Grid.MessagingServer.exe.config28
-rw-r--r--bin/OpenSim.Grid.ScriptServer.exe.config28
-rw-r--r--bin/OpenSim.Grid.UserServer.exe.config28
-rwxr-xr-xbin/OpenSim.exe.config2
-rw-r--r--bin/Robust.HG.ini.example29
-rw-r--r--bin/config-include/GridCommon.ini.example8
-rw-r--r--bin/config-include/StandaloneCommon.ini.example18
-rw-r--r--bin/config-include/StandaloneHypergrid.ini8
10 files changed, 52 insertions, 134 deletions
diff --git a/bin/OpenSim.Grid.GridServer.addin.xml b/bin/OpenSim.Grid.GridServer.addin.xml
deleted file mode 100644
index 85742a1..0000000
--- a/bin/OpenSim.Grid.GridServer.addin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
1<Addin id="OpenSim.Grid.GridServer" isroot="true" version="0.5">
2 <Runtime>
3 <Import assembly="OpenSim.Grid.GridServer.exe"/>
4 <Import assembly="OpenSim.Framework.dll"/>
5 </Runtime>
6 <ExtensionPoint path = "/OpenSim/GridServer">
7 <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.GridServer.IGridPlugin"/>
8 </ExtensionPoint>
9</Addin>
diff --git a/bin/OpenSim.Grid.GridServer.exe.config b/bin/OpenSim.Grid.GridServer.exe.config
deleted file mode 100644
index efc486f..0000000
--- a/bin/OpenSim.Grid.GridServer.exe.config
+++ /dev/null
@@ -1,28 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <appSettings>
7 </appSettings>
8 <log4net>
9 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
10 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
12 </layout>
13 </appender>
14 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
15 <file value="OpenSim.Grid.GridServer.log" />
16 <appendToFile value="true" />
17 <layout type="log4net.Layout.PatternLayout">
18 <conversionPattern value="%date %-5level - %logger %message%newline" />
19 </layout>
20 </appender>
21
22 <root>
23 <level value="DEBUG" />
24 <appender-ref ref="Console" />
25 <appender-ref ref="LogFileAppender" />
26 </root>
27 </log4net>
28</configuration>
diff --git a/bin/OpenSim.Grid.MessagingServer.exe.config b/bin/OpenSim.Grid.MessagingServer.exe.config
deleted file mode 100644
index 481ce4b..0000000
--- a/bin/OpenSim.Grid.MessagingServer.exe.config
+++ /dev/null
@@ -1,28 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <appSettings>
7 </appSettings>
8 <log4net>
9 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
10 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
12 </layout>
13 </appender>
14 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
15 <file value="OpenSim.Grid.MessagingServer.log" />
16 <appendToFile value="true" />
17 <layout type="log4net.Layout.PatternLayout">
18 <conversionPattern value="%date %-5level - %logger %message%newline" />
19 </layout>
20 </appender>
21
22 <root>
23 <level value="DEBUG" />
24 <appender-ref ref="Console" />
25 <appender-ref ref="LogFileAppender" />
26 </root>
27 </log4net>
28</configuration>
diff --git a/bin/OpenSim.Grid.ScriptServer.exe.config b/bin/OpenSim.Grid.ScriptServer.exe.config
deleted file mode 100644
index 5cae2b0..0000000
--- a/bin/OpenSim.Grid.ScriptServer.exe.config
+++ /dev/null
@@ -1,28 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <appSettings>
7 </appSettings>
8 <log4net>
9 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
10 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
12 </layout>
13 </appender>
14 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
15 <file value="OpenSim.Grid.ScriptServer.log" />
16 <appendToFile value="true" />
17 <layout type="log4net.Layout.PatternLayout">
18 <conversionPattern value="%date %-5level - %logger %message%newline" />
19 </layout>
20 </appender>
21
22 <root>
23 <level value="DEBUG" />
24 <appender-ref ref="Console" />
25 <appender-ref ref="LogFileAppender" />
26 </root>
27 </log4net>
28</configuration>
diff --git a/bin/OpenSim.Grid.UserServer.exe.config b/bin/OpenSim.Grid.UserServer.exe.config
deleted file mode 100644
index 315e69d..0000000
--- a/bin/OpenSim.Grid.UserServer.exe.config
+++ /dev/null
@@ -1,28 +0,0 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <appSettings>
7 </appSettings>
8 <log4net>
9 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
10 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
12 </layout>
13 </appender>
14 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
15 <file value="OpenSim.Grid.UserServer.log" />
16 <appendToFile value="true" />
17 <layout type="log4net.Layout.PatternLayout">
18 <conversionPattern value="%date %-5level - %logger %message%newline" />
19 </layout>
20 </appender>
21
22 <root>
23 <level value="DEBUG" />
24 <appender-ref ref="Console" />
25 <appender-ref ref="LogFileAppender" />
26 </root>
27 </log4net>
28</configuration>
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 3c7adf5..eece040 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -13,6 +13,8 @@
13 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> 13 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
14 <layout type="log4net.Layout.PatternLayout"> 14 <layout type="log4net.Layout.PatternLayout">
15 <conversionPattern value="%date{HH:mm:ss} - %message" /> 15 <conversionPattern value="%date{HH:mm:ss} - %message" />
16 <!-- console log with milliseconds. Useful for debugging -->
17 <!-- <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
16 </layout> 18 </layout>
17 </appender> 19 </appender>
18 20
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/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index cb771b8..762b09a 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -78,6 +78,14 @@
78 ; 78 ;
79 FriendsServerURI = "http://mygridserver.com:8003" 79 FriendsServerURI = "http://mygridserver.com:8003"
80 80
81[HGInventoryAccessModule]
82 ;
83 ; === HG ONLY ===
84 ; Change this to your profile server
85 ; accessible from other grids
86 ;
87 ProfileServerURI = "http://mygridserver.com:8002/profiles"
88
81[Modules] 89[Modules]
82 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 90 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
83 ;; Copy the config .example file into your own .ini file and change configs there 91 ;; Copy the config .example file into your own .ini file and change configs there
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 1fcf043..58059f5 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -25,6 +25,15 @@
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[HGInventoryAccessModule]
35 ProfileServerURI = "http://127.0.0.1:9000/profiles"
36
28[Modules] 37[Modules]
29 ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. 38 ;; 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 39 ;; Copy the config .example file into your own .ini file and change configs there
@@ -68,11 +77,12 @@
68 77
69[LoginService] 78[LoginService]
70 WelcomeMessage = "Welcome, Avatar!" 79 WelcomeMessage = "Welcome, Avatar!"
71
72 HomeURI = "http://127.0.0.1:9000"
73 GatekeeperURI = "http://127.0.0.1:9000" 80 GatekeeperURI = "http://127.0.0.1:9000"
74 InventoryServerURI = "http://127.0.0.1:9000" 81
75 AssetServerURI = "http://127.0.0.1:9000" 82 SRV_HomeURI = "http://127.0.0.1:9000"
83 SRV_InventoryServerURI = "http://127.0.0.1:9000"
84 SRV_AssetServerURI = "http://127.0.0.1:9000"
85 SRV_ProfileServerURI = "http://127.0.0.1:9000"
76 86
77[GatekeeperService] 87[GatekeeperService]
78 ExternalName = "http://127.0.0.1:9000" 88 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]
generated by cgit v1.1 at 2024-11-17 14:19:38 +0000