aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAi Austin2010-08-16 15:44:54 +0100
committerJustin Clark-Casey (justincc)2010-08-20 18:03:21 +0100
commit2c0ba8718ac638483461e7862bf487ed11d23a4a (patch)
tree101ff9ccc81e23c842f56a4c935743da39a79bb4
parentminor: remove mono compiler warning (diff)
downloadopensim-SC_OLD-2c0ba8718ac638483461e7862bf487ed11d23a4a.zip
opensim-SC_OLD-2c0ba8718ac638483461e7862bf487ed11d23a4a.tar.gz
opensim-SC_OLD-2c0ba8718ac638483461e7862bf487ed11d23a4a.tar.bz2
opensim-SC_OLD-2c0ba8718ac638483461e7862bf487ed11d23a4a.tar.xz
Robust.ini.example and Robust.HG.ini.example default: corrected comment about realm for UserAccountService to state default is useraccount, and include default realm commented out in every case
-rw-r--r--bin/Robust.HG.ini.example68
-rw-r--r--bin/Robust.ini.example25
2 files changed, 53 insertions, 40 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 15b4d39..b68f65d 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -1,14 +1,24 @@
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 4; * Configurations for enabling HG1.5
5 5; *
6;; HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService 6; * HG1.5 handlers are: OpenSim.Server.Handlers.dll:GatekeeperService
7;; OpenSim.Server.Handlers.dll:UserAgentService 7; * OpenSim.Server.Handlers.dll:UserAgentService
8;; Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and 8; * Additional OpenSim.Server.Handlers.dll:AssetServiceConnector and
9;; OpenSim.Server.Handlers.dll:XInventoryInConnector 9; * OpenSim.Server.Handlers.dll:XInventoryInConnector
10;; are started in port 8002, outside the firewall 10; * are started in port 8002, outside the firewall
11;; 11; *
12; * The startup section lists all the connectors to start up in this server
13; * instance. This may be only one, or it may be the entire server suite.
14; * Multiple connectors should be separated by commas.
15; *
16; * These are the IN connectors the server uses, the in connectors
17; * read this config file and load the needed service and database connectors
18; *
19; * The full syntax of a connector string is:
20; * [[<ConfigName>@]<port>/]<class name>[:<dll name>]
21; *
12 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"
@@ -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,12 +100,12 @@ 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 = "users"
104 ; These are for creating new accounts by the service
93 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 105 AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
94 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 106 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
95 GridService = "OpenSim.Services.GridService.dll:GridService" 107 GridService = "OpenSim.Services.GridService.dll:GridService"
96 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 108 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
97
98[GridUserService] 109[GridUserService]
99 ; for the server connector 110 ; for the server connector
100 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService" 111 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
@@ -131,7 +142,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
131 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" 142 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
132 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" 143 FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
133 144
134 WelcomeMessage = "Welcome, Avatar!" 145 WelcomeMessage = "Welcome to OpenSim!"
135 AllowRemoteSetLoginLevel = "false" 146 AllowRemoteSetLoginLevel = "false"
136 147
137 ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) 148 ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
@@ -186,7 +197,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
186 ; currently unused 197 ; currently unused
187 ;password = http://127.0.0.1/password 198 ;password = http://127.0.0.1/password
188 199
189
190[GatekeeperService] 200[GatekeeperService]
191 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" 201 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
192 ;; for the service 202 ;; for the service
@@ -200,9 +210,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
200 ; CHANGE THIS 210 ; CHANGE THIS
201 ExternalName = "http://127.0.0.1:8002" 211 ExternalName = "http://127.0.0.1:8002"
202 212
203 ; Does this grid allow incoming links to any region in it? 213 ; 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 214 ; If false, HG TPs happen only to the Default regions specified in [GridService] section
205 AllowTeleportsToAnyRegion = true 215 AllowTeleportsToAnyRegion = true
206 216
207[UserAgentService] 217[UserAgentService]
208 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" 218 LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
@@ -211,12 +221,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
211 GridService = "OpenSim.Services.GridService.dll:GridService" 221 GridService = "OpenSim.Services.GridService.dll:GridService"
212 GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService" 222 GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
213 223
214;; The interface that local users get when they are in other grids. 224; * The interface that local users get when they are in other grids.
215;; This restricts the inventory operations while in other grids. 225; * This restricts the inventory operations while in other grids.
216;; Still not completely safe, especially if users perform inventory operations 226; * 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 227; * while in those grids. The more the user accesses his/her inventory, the more
218;; those simulators will know about the user's inventory. 228; * those simulators will know about the user's inventory.
229; *
219[HGInventoryService] 230[HGInventoryService]
220 ; For the InventoryServiceInConnector 231 ; For the InventoryServiceInConnector
221 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService" 232 LocalServiceModule = "OpenSim.Services.InventoryService.dll:HGInventoryService"
222
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 96dfc01..a940cc8 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -1,14 +1,17 @@
1; * Run
2; * $ Robust.exe -inifile Robust.ini
3; *
1; * The startup section lists all the connectors to start up in this server 4; * 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. 5; * instance. This may be only one, or it may be the entire server suite.
3; * Multiple connectors should be seaprated by commas. 6; * 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; * 7; *
8; * These are the IN connectors the server uses, the in connectors 8; * These are the IN connectors the server uses, the in connectors
9; * read this config file and load the needed service and database connectors 9; * read this config file and load the needed service and database connectors
10; * 10; *
11; * The full syntax of a connector string is:
12; * [[<ConfigName>@]<port>/]<class name>[:<dll name>]
11; * 13; *
14
12[Startup] 15[Startup]
13 16
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" 17ServiceConnectors = "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"
@@ -30,7 +33,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
30 StorageProvider = "OpenSim.Data.MySQL.dll" 33 StorageProvider = "OpenSim.Data.MySQL.dll"
31 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" 34 ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
32 35
33
34; * As an example, the below configuration precisely mimicks the legacy 36; * As an example, the below configuration precisely mimicks the legacy
35; * asset server. It is read by the asset IN connector (defined above) 37; * 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, 38; * and it then loads the OUT connector (a local database module). That,
@@ -54,7 +56,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
54; * 56; *
55[GridService] 57[GridService]
56 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 58 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
57 Realm = "regions" 59 ; Realm = "regions"
58 ; AllowDuplicateNames = "True" 60 ; AllowDuplicateNames = "True"
59 ;; Next, we can specify properties of regions, including default and fallback regions 61 ;; Next, we can specify properties of regions, including default and fallback regions
60 ;; The syntax is: Region_<RegionName> = "<flags>" 62 ;; The syntax is: Region_<RegionName> = "<flags>"
@@ -70,8 +72,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
70 72
71; * This is the new style authentication service. Currently, only MySQL 73; * This is the new style authentication service. Currently, only MySQL
72; * is implemented. "Realm" is the table that is used for user lookup. 74; * 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 75; * It defaults to "users", which uses the legacy tables as an
74; * as an authentication source. 76; * authentication source.
75; * 77; *
76[AuthenticationService] 78[AuthenticationService]
77 ; for the server connector 79 ; for the server connector
@@ -82,9 +84,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
82 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" 84 AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
83 UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService" 85 UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
84 86
85; * This is the new style user service. 87; * This is the new style authentication service. Currently, only MySQL
86; * "Realm" is the table that is used for user lookup. 88; * is implemented. "Realm" is the table that is used for user lookup.
87; * It defaults to "users", which uses the legacy tables 89; * It defaults to "useraccounts", which uses the new style.
90; * Realm = "users" will use the legacy tables as an authentication source
88; * 91; *
89[UserAccountService] 92[UserAccountService]
90 ; for the server connector 93 ; for the server connector