aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2010-01-31 14:01:47 -0800
committerDiva Canto2010-01-31 14:01:47 -0800
commitaf758ea16456a47832cc823465819fc4f9576c77 (patch)
treee2efc6c6bf3be178034919f232e35dbba50a781b /bin
parentCan't comment [Network] even if it's not used. (diff)
downloadopensim-SC_OLD-af758ea16456a47832cc823465819fc4f9576c77.zip
opensim-SC_OLD-af758ea16456a47832cc823465819fc4f9576c77.tar.gz
opensim-SC_OLD-af758ea16456a47832cc823465819fc4f9576c77.tar.bz2
opensim-SC_OLD-af758ea16456a47832cc823465819fc4f9576c77.tar.xz
* More config cleanup
* Added different ports (8002 and 8003) to the many services in OpenSim.Server.ini.example * Added a separate OpenSim.Server.HG.ini.example to make it easier to run
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.Server.HG.ini44
-rw-r--r--bin/OpenSim.Server.HG.ini.example173
-rw-r--r--bin/OpenSim.Server.ini.example3
-rw-r--r--bin/OpenSim.ini.example50
4 files changed, 173 insertions, 97 deletions
diff --git a/bin/OpenSim.Server.HG.ini b/bin/OpenSim.Server.HG.ini
deleted file mode 100644
index 2ec4957..0000000
--- a/bin/OpenSim.Server.HG.ini
+++ /dev/null
@@ -1,44 +0,0 @@
1;; Extra configurations for enabling HG1.5
2
3;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
4;; OpenSim.Server.Handlers.dll:UserAgentService
5;; OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector
6
7ServiceConnectors = "8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/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,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector"
8
9[LoginService]
10 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
11 ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
12 ; CHANGE THIS
13 HomeURI = "http://127.0.0.1:8002"
14 GatekeeperURI = "http://127.0.0.1:8002"
15 InventoryServerURI = "http://127.0.0.1:8002"
16 AssetServerURI = "http://127.0.0.1:8002"
17
18[GatekeeperService]
19 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
20 ;; for the service
21 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
22 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
23 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
24 GridService = "OpenSim.Services.GridService.dll:GridService"
25 AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
26 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
27 ; how does the outside world reach me? This acts as public key too.
28 ; CHANGE THIS
29 ExternalName = "http://127.0.0.1:8002"
30
31[UserAgentService]
32 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
33 ;; for the service
34 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
35 GridService = "OpenSim.Services.GridService.dll:GridService"
36
37;; The interface that local users get when they are in other grids.
38;; This restricts the inventory operations while in other grids.
39;; Still not completely safe, especially if users perform inventory operations
40;; while in those grids. The more the user accesses his/her inventory, the more
41;; those simulators will know about the user's inventory.
42[HGInventoryService]
43 ; For the InventoryServiceInConnector
44 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
diff --git a/bin/OpenSim.Server.HG.ini.example b/bin/OpenSim.Server.HG.ini.example
new file mode 100644
index 0000000..7c1ccef
--- /dev/null
+++ b/bin/OpenSim.Server.HG.ini.example
@@ -0,0 +1,173 @@
1;; Configurations for enabling HG1.5
2;;
3;; Run
4;; $ OpenSim.Server.exe -inifile OpenSim.Server.HG.ini
5
6;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
7;; OpenSim.Server.Handlers.dll:UserAgentService
8;; OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector
9;;
10;; Note that we're putting the asset service in 8002.
11;; Make sure your simulators point to that.
12
13[Startup]
14ServiceConnectors = "8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/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,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector"
15
16; * This is common for all services, it's the network setup for the entire
17; * server instance, if none if specified above
18; *
19[Network]
20 port = 8003
21
22; * The following are for the remote console
23; * They have no effect for the local or basic console types
24; * Leave commented to diable logins to the console
25;ConsoleUser = Test
26;ConsolePass = secret
27;ConsolePort = 0
28
29; * As an example, the below configuration precisely mimicks the legacy
30; * asset server. It is read by the asset IN connector (defined above)
31; * and it then loads the OUT connector (a local database module). That,
32; * in turn, reads the asset loader and database connection information
33; *
34[AssetService]
35 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
36 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
37 AssetLoaderArgs = "assets/AssetSets.xml"
38 StorageProvider = "OpenSim.Data.MySQL.dll"
39 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
40
41; * This configuration loads the inventory server modules. It duplicates
42; * the function of the legacy inventory server
43; *
44[InventoryService]
45 LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
46 SessionAuthentication = "false"
47 StorageProvider = "OpenSim.Data.MySQL.dll"
48 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
49
50; * This is the new style grid service.
51; * "Realm" is the table that is used for user lookup.
52; * It defaults to "regions", which uses the legacy tables
53; *
54[GridService]
55 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
56 StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
57 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
58 Realm = "regions"
59 ; AllowDuplicateNames = "True"
60 ;; Next, we can specify properties of regions, including default and fallback regions
61 ;; The syntax is: Region_<RegionName> = "<flags>"
62 ;; or: Region_<RegionID> = "<flags>"
63 ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate
64 ;; For example:
65 ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
66 ; (replace spaces with underscore)
67
68; * This is the configuration for the freeswitch server in grid mode
69[FreeswitchService]
70 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
71
72; * This is the new style authentication service. Currently, only MySQL
73; * is implemented. "Realm" is the table that is used for user lookup.
74; * By setting it to "users", you can use the old style users table
75; * as an authentication source.
76; *
77[AuthenticationService]
78 ; for the server connector
79 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
80 ; for the service
81 StorageProvider = "OpenSim.Data.MySQL.dll"
82 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
83
84[OpenIdService]
85 ; for the server connector
86 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
87 UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
88
89; * This is the new style user service.
90; * "Realm" is the table that is used for user lookup.
91; * It defaults to "users", which uses the legacy tables
92; *
93[UserAccountService]
94 ; for the server connector
95 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
96 ; for the service
97 StorageProvider = "OpenSim.Data.MySQL.dll"
98 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
99 ; Realm = "useraccounts"
100 ;; These are for creating new accounts by the service
101 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
102 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
103 GridService = "OpenSim.Services.GridService.dll:GridService"
104 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
105
106[PresenceService]
107 ; for the server connector
108 LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
109 ; for the service
110 StorageProvider = "OpenSim.Data.MySQL.dll"
111 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
112
113[AvatarService]
114 ; for the server connector
115 LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
116 ; for the service
117 StorageProvider = "OpenSim.Data.MySQL.dll"
118 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
119
120[LibraryService]
121 LibraryName = "OpenSim Library"
122 DefaultLibrary = "./inventory/Libraries.xml"
123
124[LoginService]
125 ; for the server connector
126 LocalServiceModule = "OpenSim.Services.LLLoginService.dll:LLLoginService"
127 ; for the service
128 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
129 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
130 InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
131 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
132 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
133 GridService = "OpenSim.Services.GridService.dll:GridService"
134 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
135 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
136 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
137
138 DefaultRegion = "OpenSim Test"
139 WelcomeMessage = "Welcome, Avatar!"
140 ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
141 ; CHANGE THIS
142 HomeURI = "http://127.0.0.1:8002"
143 GatekeeperURI = "http://127.0.0.1:8002"
144 InventoryServerURI = "http://127.0.0.1:8002"
145 AssetServerURI = "http://127.0.0.1:8002"
146
147[GatekeeperService]
148 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
149 ;; for the service
150 UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
151 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
152 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
153 GridService = "OpenSim.Services.GridService.dll:GridService"
154 AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
155 SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
156 ; how does the outside world reach me? This acts as public key too.
157 ; CHANGE THIS
158 ExternalName = "http://127.0.0.1:8002"
159
160[UserAgentService]
161 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
162 ;; for the service
163 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
164 GridService = "OpenSim.Services.GridService.dll:GridService"
165
166;; The interface that local users get when they are in other grids.
167;; This restricts the inventory operations while in other grids.
168;; Still not completely safe, especially if users perform inventory operations
169;; while in those grids. The more the user accesses his/her inventory, the more
170;; those simulators will know about the user's inventory.
171[HGInventoryService]
172 ; For the InventoryServiceInConnector
173 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index ee9e661..6912d88 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -137,6 +137,3 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
137 DefaultRegion = "OpenSim Test" 137 DefaultRegion = "OpenSim Test"
138 WelcomeMessage = "Welcome, Avatar!" 138 WelcomeMessage = "Welcome, Avatar!"
139 139
140;; Uncomment if you want your grid to become Hypergrid-enabled
141;;[Hypergrid]
142;; Include-Hypergrid = "OpenSim.Server.HG.ini"
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 70f03a1..6cb3f02 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -267,56 +267,6 @@
267 ;SMTP_SERVER_LOGIN=foo 267 ;SMTP_SERVER_LOGIN=foo
268 ;SMTP_SERVER_PASSWORD=bar 268 ;SMTP_SERVER_PASSWORD=bar
269 269
270
271[Communications]
272 ;InterregionComms = "LocalComms"
273 InterregionComms = "RESTComms"
274
275
276[StandAlone]
277 ; If this is set to true then OpenSim only allows in users who already have accounts.
278 ; An account can be created using the "create user" console command.
279 ;
280 ; If this is set to false then an account is automatically created for a user who logs in
281 ; without one. PLEASE NOTE THAT IN THIS MODE NO PASSWORD CHECKS ARE PERFORMED.
282 ; Therefore, any user can log into any account. If accounts_authenticate is later switched to
283 ; true then the passwords will need to be reset (using the "reset user password" console command) since
284 ; automatically created accounts have their password set to the string "test".
285 ;
286 ; This setting applies to standalone mode only, not grid or other modes. Default is true.
287 accounts_authenticate = true
288
289 welcome_message = "Welcome to OpenSimulator"
290
291 ; Inventory database provider
292 inventory_plugin = "OpenSim.Data.SQLite.dll"
293 ; inventory_plugin = "OpenSim.Data.MySQL.dll"
294
295 ; Inventory source SQLite example
296 inventory_source = "URI=file:inventoryStore.db,version=3"
297 ; Inventory Source MySQL example
298 ;inventory_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
299
300 ; User Data Database provider
301 ;
302 ; Multiple providers can be specified by separating them with commas (whitespace is unimportant)
303 ; If multiple providers are specified then if a profile is requested, each is queried until one
304 ; provides a valid profile, or until all providers have been queried.
305 ; Unfortunately the order of querying is currently undefined (it may not be the order in which
306 ; providers are specified here). This needs to be fixed
307 ;
308 userDatabase_plugin = "OpenSim.Data.SQLite.dll"
309 ; userDatabase_plugin = "OpenSim.Data.MySQL.dll"
310
311 ; User source SQLite example
312 user_source = "URI=file:userprofiles.db,version=3"
313 ; User Source MySQL example
314 ;user_source = "Data Source=localhost;Database=opensim;User ID=opensim;Password=****;"
315
316 ; Specifies the location and filename of the default inventory library control file. The path can be relative or absolute
317 ; Default is ./inventory/Libraries.xml
318 LibrariesXMLFile="./inventory/Libraries.xml"
319
320[Network] 270[Network]
321 ConsoleUser = "Test" 271 ConsoleUser = "Test"
322 ConsolePass = "secret" 272 ConsolePass = "secret"