aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-08-21 00:32:26 +0100
committerMelanie2010-08-21 00:32:26 +0100
commitf8ff98577ef3e576326c6eea28cb12ebb4e0bdc4 (patch)
tree3ef10e646ddda95929142eb2c3774b42d0923b3b /bin
parentForward-port a small improvement to the land out connector (diff)
parentForward-port a small improvement to the land out connector (diff)
downloadopensim-SC_OLD-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.zip
opensim-SC_OLD-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.gz
opensim-SC_OLD-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.bz2
opensim-SC_OLD-f8ff98577ef3e576326c6eea28cb12ebb4e0bdc4.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example59
-rw-r--r--bin/Robust.HG.ini.example72
-rw-r--r--bin/Robust.ini.example37
3 files changed, 89 insertions, 79 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index cf9e217..674a454 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -300,7 +300,7 @@
300 300
301 ; What is reported as the "X-Secondlife-Shard" 301 ; What is reported as the "X-Secondlife-Shard"
302 ; Defaults to the user server url if not set 302 ; Defaults to the user server url if not set
303 ; The old default is "OpenSim", set here fro compatibility 303 ; The old default is "OpenSim", set here for compatibility
304 shard = "OpenSim" 304 shard = "OpenSim"
305 305
306 ; What is reported as the "User-Agent" when using llHTTPRequest 306 ; What is reported as the "User-Agent" when using llHTTPRequest
@@ -309,6 +309,18 @@
309 ; " (Mozilla Compatible)" to the text where there are problems with a web server 309 ; " (Mozilla Compatible)" to the text where there are problems with a web server
310 ;user_agent = "OpenSim LSL (Mozilla Compatible)" 310 ;user_agent = "OpenSim LSL (Mozilla Compatible)"
311 311
312[XMLRPC]
313 ; ##
314 ; ## Scripting XMLRPC mapper
315 ; ##
316
317 ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
318 ; script concurrently with the first remote_data event.
319 ; This will contain the fully qualified URI an external site needs
320 ; to use to send XMLRPC requests to that script
321
322 ;XmlRpcRouterModule = "XmlRpcRouterModule"
323 ;XmlRpcPort = 20800
312 324
313[ClientStack.LindenUDP] 325[ClientStack.LindenUDP]
314 ; Set this to true to process incoming packets asynchronously. Networking is 326 ; Set this to true to process incoming packets asynchronously. Networking is
@@ -1180,37 +1192,38 @@ UseSafetyCommit = true
1180 ;vivox_channel_clamping_distance = 10 1192 ;vivox_channel_clamping_distance = 10
1181 1193
1182[FreeSwitchVoice] 1194[FreeSwitchVoice]
1183 ; In order for this to work you need a functioning freeswitch pbx set 1195 ; In order for this to work you need a functioning FreeSWITCH PBX set up.
1184 ; up. Configuration for that will be posted in the wiki soon. 1196 ; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module
1185 enabled = false 1197 enabled = false
1186 ;FreeSwitch server is going to contact us and ask us all 1198 ; FreeSWITCH server is going to contact us and ask us all sorts of things
1187 ;sorts of things.
1188 freeswitch_server_user = freeswitch 1199 freeswitch_server_user = freeswitch
1189 freeswitch_server_pass = password 1200 freeswitch_server_pass = password
1190 freeswitch_api_prefix = /api 1201 freeswitch_api_prefix = /api
1191 ; this is the IP of your sim 1202 ; external IP address of your OpenSim voice enabled region
1203 ; note: all regions running on same OpenSim.exe will be enabled
1192 freeswitch_service_server = ip.address.of.your.sim 1204 freeswitch_service_server = ip.address.of.your.sim
1193 ;freeswitch_service_port = 80
1194 ; this should be the same port the region listens on 1205 ; this should be the same port the region listens on
1195 freeswitch_service_port = 9000 1206 freeswitch_service_port = 9000
1196 freeswitch_realm = ip.address.of.freeswitch.server 1207 freeswitch_realm = ip.address.of.freeswitch.server
1197 freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060 1208 freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060
1209 ; STUN = Simple Traversal of UDP through NATs
1210 ; See http://wiki.freeswitch.org/wiki/NAT_Traversal
1211 ; stun.freeswitch.org is not guaranteed to be running so use it in production at your own risk
1198 freeswitch_attempt_stun = false 1212 freeswitch_attempt_stun = false
1199 freeswitch_stun_server = ip.address.of.freeswitch.server 1213 freeswitch_stun_server = ip.address.of.stun.server
1200 freeswitch_echo_server = ip.address.of.freeswitch.server 1214 freeswitch_echo_server = ip.address.of.freeswitch.server
1201 freeswitch_echo_port = 50505 1215 freeswitch_echo_port = 50505
1202 freeswitch_well_known_ip = ip.address.of.freeswitch.server 1216 freeswitch_well_known_ip = ip.address.of.freeswitch.server
1203 1217 ;
1204 ;Type the address of your http server here, hostname is allowed. This is provided so you can specify a hostname 1218 ; Type the address of your http server here, hostname is allowed. This is provided so you can specify a hostname
1205 ;This is used by client for account verification. By default, it's the same as the freeswitch service server. 1219 ; This is used by client for account verification. By default, it's the same as the freeswitch service server.
1206 1220 ;
1207 ;opensim_well_known_http_address = Address_Of_your_SIM_HTTP_Server_Hostname_Allowed 1221 ; opensim_well_known_http_address = Address_Of_Your_SIM_HTTP_Server_Hostname_Allowed
1208 1222 ;
1209 freeswitch_default_timeout = 5000 1223 freeswitch_default_timeout = 5000
1210 freeswitch_subscribe_retry = 120 1224 freeswitch_subscribe_retry = 120
1211 ; freeswitch_password_reset_url = 1225 ; freeswitch_password_reset_url =
1212 1226
1213
1214[Groups] 1227[Groups]
1215 Enabled = false 1228 Enabled = false
1216 1229
@@ -1331,16 +1344,8 @@ Message = "The MOTD module is working!"
1331[Modules] 1344[Modules]
1332 Include-modules = "addon-modules/*/config/*.ini" 1345 Include-modules = "addon-modules/*/config/*.ini"
1333 1346
1334[XMLRPC]
1335 ; ##
1336 ; ## Scripting XMLRPC mapper
1337 ; ##
1338
1339 ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
1340 ; script concurrently with the first remote_data event.
1341 ; This will contain the fully qualified URI an external site needs
1342 ; to use to send XMLRPC requests to that script
1343
1344 ;XmlRpcRouterModule = "XmlRpcRouterModule"
1345 ;XmlRpcPort = 20800
1346 1347
1348;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1349;; ENSURE [Architecture] and [Modules] Sections with their "includes"
1350;; are last to allow for overrides
1351;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 15b4d39..122ba2e 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -1,15 +1,25 @@
1;; Configurations for enabling HG1.5 1; * Run
2;; 2; * $ Robust.exe -inifile Robust.HG.ini
3;; Run 3; *
4;; $ Robust.exe -inifile Robust.HG.ini
5
6;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
7;; OpenSim.Server.Handlers.dll:UserAgentService
8;; Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and
9;; OpenSim.Server.Handlers.dll:XInventoryInConnector
10;; are started in port 8002, outside the firewall
11;;
12 4
5; * Configurations for enabling HG1.5
6; *
7; * HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
8; * OpenSim.Server.Handlers.dll:UserAgentService
9; * Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and
10; * OpenSim.Server.Handlers.dll:XInventoryInConnector
11; * are started in port 8002, outside the firewall
12; *
13; * The startup section lists all the connectors to start up in this server
14; * instance. This may be only one, or it may be the entire server suite.
15; * Multiple connectors should be separated by commas.
16; *
17; * These are the IN connectors the server uses, the in connectors
18; * read this config file and load the needed service and database connectors
19; *
20; * The full syntax of a connector string is:
21; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
22; *
13[Startup] 23[Startup]
14ServiceConnectors = "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" 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"
15 25
@@ -52,10 +62,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
52; * 62; *
53[GridService] 63[GridService]
54 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 64 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
55 Realm = "regions" 65 ; Realm = "regions"
56 ; AllowDuplicateNames = "True" 66 ; AllowDuplicateNames = "True"
57 ; Check4096 = "False" 67 ; Check4096 = "False"
58 68
59 ;; Next, we can specify properties of regions, including default and fallback regions 69 ;; Next, we can specify properties of regions, including default and fallback regions
60 ;; The syntax is: Region_<RegionName> = "<flags>" 70 ;; The syntax is: Region_<RegionName> = "<flags>"
61 ;; or: Region_<RegionID> = "<flags>" 71 ;; or: Region_<RegionID> = "<flags>"
@@ -70,12 +80,13 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
70 80
71; * This is the new style authentication service. Currently, only MySQL 81; * This is the new style authentication service. Currently, only MySQL
72; * is implemented. "Realm" is the table that is used for user lookup. 82; * is implemented. "Realm" is the table that is used for user lookup.
73; * By setting it to "users", you can use the old style users table 83; * It defaults to "useraccounts", which uses the new style.
74; * as an authentication source. 84; * Realm = "users" will use the legacy tables as an authentication source
75; * 85; *
76[AuthenticationService] 86[AuthenticationService]
77 ; for the server connector 87 ; for the server connector
78 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 88 LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
89 ; Realm = "useraccounts"
79 90
80[OpenIdService] 91[OpenIdService]
81 ; for the server connector 92 ; for the server connector
@@ -89,7 +100,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
89[UserAccountService] 100[UserAccountService]
90 ; for the server connector 101 ; for the server connector
91 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 102 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
92 ;; These are for creating new accounts by the service 103 ; Realm = "usersaccounts"
104
105 ; These are for creating new accounts by the service
93 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 106 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
94 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 107 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
95 GridService = "OpenSim.Services.GridService.dll:GridService" 108 GridService = "OpenSim.Services.GridService.dll:GridService"
@@ -161,32 +174,25 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
161 174
162 ; login page: optional: if it exists it will be used to tell the client to use 175 ; login page: optional: if it exists it will be used to tell the client to use
163 ; this as splash page 176 ; this as splash page
164 ; currently unused
165 ;welcome = http://127.0.0.1/welcome 177 ;welcome = http://127.0.0.1/welcome
166 178
167 ; helper uri: optional: if it exists if will be used to tell the client to use 179 ; helper uri: optional: if it exists if will be used to tell the client to use
168 ; this for all economy related things 180 ; this for all economy related things
169 ; currently unused
170 ;economy = http://127.0.0.1:9000/ 181 ;economy = http://127.0.0.1:9000/
171 182
172 ; web page of grid: optional: page providing further information about your grid 183 ; web page of grid: optional: page providing further information about your grid
173 ; currently unused
174 ;about = http://127.0.0.1/about/ 184 ;about = http://127.0.0.1/about/
175 185
176 ; account creation: optional: page providing further information about obtaining 186 ; account creation: optional: page providing further information about obtaining
177 ; a user account on your grid 187 ; a user account on your grid
178 ; currently unused
179 ;register = http://127.0.0.1/register 188 ;register = http://127.0.0.1/register
180 189
181 ; help: optional: page providing further assistance for users of your grid 190 ; help: optional: page providing further assistance for users of your grid
182 ; currently unused
183 ;help = http://127.0.0.1/help 191 ;help = http://127.0.0.1/help
184 192
185 ; password help: optional: page providing password assistance for users of your grid 193 ; password help: optional: page providing password assistance for users of your grid
186 ; currently unused
187 ;password = http://127.0.0.1/password 194 ;password = http://127.0.0.1/password
188 195
189
190[GatekeeperService] 196[GatekeeperService]
191 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" 197 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
192 ;; for the service 198 ;; for the service
@@ -200,9 +206,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
200 ; CHANGE THIS 206 ; CHANGE THIS
201 ExternalName = "http://127.0.0.1:8002" 207 ExternalName = "http://127.0.0.1:8002"
202 208
203 ; Does this grid allow incoming links to any region in it? 209 ; Does this grid allow incoming links to any region in it?
204 ; If false, HG TPs happen only to the Default regions specified in [GridService] section 210 ; If false, HG TPs happen only to the Default regions specified in [GridService] section
205 AllowTeleportsToAnyRegion = true 211 AllowTeleportsToAnyRegion = true
206 212
207[UserAgentService] 213[UserAgentService]
208 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" 214 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
@@ -211,12 +217,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
211 GridService = "OpenSim.Services.GridService.dll:GridService" 217 GridService = "OpenSim.Services.GridService.dll:GridService"
212 GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService" 218 GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
213 219
214;; The interface that local users get when they are in other grids. 220; * The interface that local users get when they are in other grids.
215;; This restricts the inventory operations while in other grids. 221; * This restricts the inventory operations while in other grids.
216;; Still not completely safe, especially if users perform inventory operations 222; * Still not completely safe, especially if users perform inventory operations
217;; while in those grids. The more the user accesses his/her inventory, the more 223; * while in those grids. The more the user accesses his/her inventory, the more
218;; those simulators will know about the user's inventory. 224; * those simulators will know about the user's inventory.
225; *
219[HGInventoryService] 226[HGInventoryService]
220 ; For the InventoryServiceInConnector 227 ; For the InventoryServiceInConnector
221 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" 228 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
222
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 96dfc01..0353eec 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -1,16 +1,18 @@
1; * Run
2; * $ Robust.exe -inifile Robust.ini
3; *
4
1; * The startup section lists all the connectors to start up in this server 5; * 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. 6; * instance. This may be only one, or it may be the entire server suite.
3; * Multiple connectors should be seaprated by commas. 7; * Multiple connectors should be separated by commas.
4; * The startup section lists all the connectors to start up in this server
5; * instance. This may be only one, or it may be the entire server suite.
6; * Multiple connectors should be seaprated by commas.
7; * 8; *
8; * These are the IN connectors the server uses, the in connectors 9; * These are the IN connectors the server uses, the in connectors
9; * read this config file and load the needed service and database connectors 10; * read this config file and load the needed service and database connectors
10; * 11; *
12; * The full syntax of a connector string is:
13; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
11; * 14; *
12[Startup] 15[Startup]
13
14ServiceConnectors = "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" 16ServiceConnectors = "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"
15 17
16; * This is common for all services, it's the network setup for the entire 18; * This is common for all services, it's the network setup for the entire
@@ -30,7 +32,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
30 StorageProvider = "OpenSim.Data.MySQL.dll" 32 StorageProvider = "OpenSim.Data.MySQL.dll"
31 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" 33 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
32 34
33
34; * As an example, the below configuration precisely mimicks the legacy 35; * As an example, the below configuration precisely mimicks the legacy
35; * asset server. It is read by the asset IN connector (defined above) 36; * asset server. It is read by the asset IN connector (defined above)
36; * and it then loads the OUT connector (a local database module). That, 37; * and it then loads the OUT connector (a local database module). That,
@@ -54,8 +55,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
54; * 55; *
55[GridService] 56[GridService]
56 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 57 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
57 Realm = "regions" 58 ; Realm = "regions"
58 ; AllowDuplicateNames = "True" 59 ; AllowDuplicateNames = "True"
60 ; Check4096 = "False"
61
59 ;; Next, we can specify properties of regions, including default and fallback regions 62 ;; Next, we can specify properties of regions, including default and fallback regions
60 ;; The syntax is: Region_<RegionName> = "<flags>" 63 ;; The syntax is: Region_<RegionName> = "<flags>"
61 ;; or: Region_<RegionID> = "<flags>" 64 ;; or: Region_<RegionID> = "<flags>"
@@ -70,8 +73,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
70 73
71; * This is the new style authentication service. Currently, only MySQL 74; * This is the new style authentication service. Currently, only MySQL
72; * is implemented. "Realm" is the table that is used for user lookup. 75; * is implemented. "Realm" is the table that is used for user lookup.
73; * By setting it to "users", you can use the old style users table 76; * It defaults to "users", which uses the legacy tables as an
74; * as an authentication source. 77; * authentication source.
75; * 78; *
76[AuthenticationService] 79[AuthenticationService]
77 ; for the server connector 80 ; for the server connector
@@ -82,15 +85,17 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
82 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 85 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
83 UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 86 UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
84 87
85; * This is the new style user service. 88; * This is the new style authentication service. Currently, only MySQL
86; * "Realm" is the table that is used for user lookup. 89; * is implemented. "Realm" is the table that is used for user lookup.
87; * It defaults to "users", which uses the legacy tables 90; * It defaults to "useraccounts", which uses the new style.
91; * Realm = "users" will use the legacy tables as an authentication source
88; * 92; *
89[UserAccountService] 93[UserAccountService]
90 ; for the server connector 94 ; for the server connector
91 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 95 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
92 ; Realm = "useraccounts" 96 ; Realm = "useraccounts"
93 ;; These are for creating new accounts by the service 97
98 ; These are for creating new accounts by the service
94 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 99 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
95 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 100 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
96 GridService = "OpenSim.Services.GridService.dll:GridService" 101 GridService = "OpenSim.Services.GridService.dll:GridService"
@@ -158,27 +163,21 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
158 163
159 ; login page: optional: if it exists it will be used to tell the client to use 164 ; login page: optional: if it exists it will be used to tell the client to use
160 ; this as splash page 165 ; this as splash page
161 ; currently unused
162 ;welcome = http://127.0.0.1/welcome 166 ;welcome = http://127.0.0.1/welcome
163 167
164 ; helper uri: optional: if it exists if will be used to tell the client to use 168 ; helper uri: optional: if it exists if will be used to tell the client to use
165 ; this for all economy related things 169 ; this for all economy related things
166 ; currently unused
167 ;economy = http://127.0.0.1:9000/ 170 ;economy = http://127.0.0.1:9000/
168 171
169 ; web page of grid: optional: page providing further information about your grid 172 ; web page of grid: optional: page providing further information about your grid
170 ; currently unused
171 ;about = http://127.0.0.1/about/ 173 ;about = http://127.0.0.1/about/
172 174
173 ; account creation: optional: page providing further information about obtaining 175 ; account creation: optional: page providing further information about obtaining
174 ; a user account on your grid 176 ; a user account on your grid
175 ; currently unused
176 ;register = http://127.0.0.1/register 177 ;register = http://127.0.0.1/register
177 178
178 ; help: optional: page providing further assistance for users of your grid 179 ; help: optional: page providing further assistance for users of your grid
179 ; currently unused
180 ;help = http://127.0.0.1/help 180 ;help = http://127.0.0.1/help
181 181
182 ; password help: optional: page providing password assistance for users of your grid 182 ; password help: optional: page providing password assistance for users of your grid
183 ; currently unused
184 ;password = http://127.0.0.1/password 183 ;password = http://127.0.0.1/password