aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.Grid.AssetServer.exe.config35
-rw-r--r--bin/OpenSim.Grid.InventoryServer.exe.config35
-rw-r--r--bin/OpenSim.GridServer.ini.example35
-rw-r--r--bin/OpenSim.ini.example6
-rw-r--r--bin/config-include/Standalone.ini6
-rw-r--r--bin/config-include/StandaloneHypergrid.ini7
6 files changed, 52 insertions, 72 deletions
diff --git a/bin/OpenSim.Grid.AssetServer.exe.config b/bin/OpenSim.Grid.AssetServer.exe.config
deleted file mode 100644
index 58404fd..0000000
--- a/bin/OpenSim.Grid.AssetServer.exe.config
+++ /dev/null
@@ -1,35 +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.AssetServer.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 <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
23 <logger name="NHibernate" additivity="false">
24 <level value="INFO"/>
25 <appender-ref ref="NHibernateFileLog"/>
26 </logger>
27
28
29 <root>
30 <level value="DEBUG" />
31 <appender-ref ref="Console" />
32 <appender-ref ref="LogFileAppender" />
33 </root>
34 </log4net>
35</configuration>
diff --git a/bin/OpenSim.Grid.InventoryServer.exe.config b/bin/OpenSim.Grid.InventoryServer.exe.config
deleted file mode 100644
index b1315c1..0000000
--- a/bin/OpenSim.Grid.InventoryServer.exe.config
+++ /dev/null
@@ -1,35 +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.InventoryServer.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 <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
23 <logger name="NHibernate" additivity="false">
24 <level value="INFO"/>
25 <appender-ref ref="NHibernateFileLog"/>
26 </logger>
27
28
29 <root>
30 <level value="DEBUG" />
31 <appender-ref ref="Console" />
32 <appender-ref ref="LogFileAppender" />
33 </root>
34 </log4net>
35</configuration>
diff --git a/bin/OpenSim.GridServer.ini.example b/bin/OpenSim.GridServer.ini.example
new file mode 100644
index 0000000..695bf9e
--- /dev/null
+++ b/bin/OpenSim.GridServer.ini.example
@@ -0,0 +1,35 @@
1; * The startup section lists all the connectors to start up in this server
2; * instance. This may be only one, or it may be the entire server suite.
3; * Multiple connectors should be seaprated by commas.
4; *
5; * These are the IN connectors the server uses, the in connectors
6; * read this config file and load the needed OUT and database connectors
7; *
8; *
9[Startup]
10 ServiceConnectors = "OpenSim.Server.Handlers.dll:GridServiceConnector"
11
12; * This is common for all services, it's the network setup for the entire
13; * server instance
14; *
15[Network]
16 port = 8002
17
18; * The following are for the remote console
19; * They have no effect for the local or basic console types
20; * Leave commented to diable logins to the console
21;ConsoleUser = Test
22;ConsolePass = secret
23
24; * As an example, the below configuration precisely mimicks the legacy
25; * asset server. It is read by the asset IN connector (defined above)
26; * and it then loads the OUT connector (a local database module). That,
27; * in turn, reads the asset loader and database connection information
28; *
29[GridService]
30 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
31 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
32 ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
33 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
34 Realm = "regions"
35
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d38c511..7a65efe 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -305,6 +305,10 @@
305 http_listener_sslport = 9001 ; Use this port for SSL connections 305 http_listener_sslport = 9001 ; Use this port for SSL connections
306 http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer 306 http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer
307 307
308 ; Hostname to use in llRequestURL/llRequestSecureURL
309 ; if not defined - default machine name is being used
310 ; (on Windows this mean NETBIOS name - useably only inside local network)
311 ; ExternalHostNameForLSL=127.0.0.1
308 ; Uncomment below to enable llRemoteData/remote channels 312 ; Uncomment below to enable llRemoteData/remote channels
309 ; remoteDataPort = 20800 313 ; remoteDataPort = 20800
310 314
@@ -1307,7 +1311,7 @@
1307 ;NoticesEnabled = true 1311 ;NoticesEnabled = true
1308 1312
1309 ; This makes the Groups modules very chatty on the console. 1313 ; This makes the Groups modules very chatty on the console.
1310 ;DebugEnabled = true 1314 DebugEnabled = false
1311 1315
1312 ; Specify which messaging module to use for groups messaging and if it's enabled 1316 ; Specify which messaging module to use for groups messaging and if it's enabled
1313 ;MessagingModule = GroupsMessagingModule 1317 ;MessagingModule = GroupsMessagingModule
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 24020b6..5a5cbff 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -12,6 +12,7 @@
12 InventoryServices = "LocalInventoryServicesConnector" 12 InventoryServices = "LocalInventoryServicesConnector"
13 NeighbourServices = "LocalNeighbourServicesConnector" 13 NeighbourServices = "LocalNeighbourServicesConnector"
14 AuthorizationServices = "LocalAuthorizationServicesConnector" 14 AuthorizationServices = "LocalAuthorizationServicesConnector"
15 GridServices = "LocalGridServicesConnector"
15 16
16[AssetService] 17[AssetService]
17 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 18 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
@@ -21,3 +22,8 @@
21 22
22[AuthorizationService] 23[AuthorizationService]
23 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" 24 LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
25
26[GridService]
27 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
28 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
29 \ No newline at end of file
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index aa122be..b14517d 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -12,9 +12,11 @@
12 InventoryServices = "HGInventoryBroker" 12 InventoryServices = "HGInventoryBroker"
13 NeighbourServices = "LocalNeighbourServicesConnector" 13 NeighbourServices = "LocalNeighbourServicesConnector"
14 AuthorizationServices = "LocalAuthorizationServicesConnector" 14 AuthorizationServices = "LocalAuthorizationServicesConnector"
15 GridServices = "HGGridServicesConnector"
15 InventoryServiceInConnector = true 16 InventoryServiceInConnector = true
16 AssetServiceInConnector = true 17 AssetServiceInConnector = true
17 HGAuthServiceInConnector = true 18 HGAuthServiceInConnector = true
19 HypergridServiceInConnector = true
18 20
19[AssetService] 21[AssetService]
20 ; For the AssetServiceInConnector 22 ; For the AssetServiceInConnector
@@ -39,4 +41,7 @@
39 ; For the HGAuthServiceInConnector 41 ; For the HGAuthServiceInConnector
40 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService" 42 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:HGAuthenticationService"
41 43
42 \ No newline at end of file 44[GridService]
45 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
46 GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:LocalGridServicesConnector"
47 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" \ No newline at end of file