diff options
author | Diva Canto | 2010-12-09 09:30:17 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-09 09:30:17 -0800 |
commit | 3675bb29816e43e7831db14ba07c86ef0cb158da (patch) | |
tree | c5369aee2bac2a7c9b208bf0c0bd6bcc289ad4c6 /bin | |
parent | Minor bug fixes. Hunting down mantis #5259 (diff) | |
download | opensim-SC_OLD-3675bb29816e43e7831db14ba07c86ef0cb158da.zip opensim-SC_OLD-3675bb29816e43e7831db14ba07c86ef0cb158da.tar.gz opensim-SC_OLD-3675bb29816e43e7831db14ba07c86ef0cb158da.tar.bz2 opensim-SC_OLD-3675bb29816e43e7831db14ba07c86ef0cb158da.tar.xz |
Make configs consistent, as per mantos #5258
Diffstat (limited to '')
-rw-r--r-- | bin/Robust.HG.ini.example | 32 | ||||
-rw-r--r-- | bin/Robust.ini.example | 10 | ||||
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 2 |
3 files changed, 27 insertions, 17 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index dbac73b..c690e06 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -24,7 +24,7 @@ | |||
24 | ServiceConnectors = "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" | 24 | ServiceConnectors = "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 is specified above |
28 | ; * | 28 | ; * |
29 | [Network] | 29 | [Network] |
30 | port = 8003 | 30 | port = 8003 |
@@ -48,7 +48,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
48 | [AssetService] | 48 | [AssetService] |
49 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | 49 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" |
50 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | 50 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" |
51 | AssetLoaderArgs = "assets/AssetSets.xml" | 51 | AssetLoaderArgs = "./assets/AssetSets.xml" |
52 | 52 | ||
53 | ; * This configuration loads the inventory server modules. It duplicates | 53 | ; * This configuration loads the inventory server modules. It duplicates |
54 | ; * the function of the legacy inventory server | 54 | ; * the function of the legacy inventory server |
@@ -79,11 +79,22 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
79 | ; * This is the configuration for the freeswitch server in grid mode | 79 | ; * This is the configuration for the freeswitch server in grid mode |
80 | [FreeswitchService] | 80 | [FreeswitchService] |
81 | LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" | 81 | LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" |
82 | ;; IP of your FS server | ||
83 | ; ServerAddress = 127.0.0.1 | ||
84 | |||
85 | ;; All other options are - well - optional | ||
86 | ; Realm = "127.0.0.1" | ||
87 | ; SIPProxy = "127.0.0.1:5060" | ||
88 | ; EchoServer = "127.0.0.1" | ||
89 | ; EchoPort = 50505 | ||
90 | ; AttemptSTUN = "false" | ||
91 | ; DefaultTimeout = 5000 | ||
92 | ; Context = "default" | ||
93 | ; UserName = "freeswitch" | ||
94 | ; Password = "password" | ||
82 | 95 | ||
83 | ; * This is the new style authentication service. Currently, only MySQL | 96 | ; * This is the new style authentication service. Currently, only MySQL |
84 | ; * is implemented. "Realm" is the table that is used for user lookup. | 97 | ; * is implemented. |
85 | ; * It defaults to "useraccounts", which uses the new style. | ||
86 | ; * Realm = "users" will use the legacy tables as an authentication source | ||
87 | ; * | 98 | ; * |
88 | [AuthenticationService] | 99 | [AuthenticationService] |
89 | ; for the server connector | 100 | ; for the server connector |
@@ -97,7 +108,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
97 | 108 | ||
98 | ; * This is the new style user service. | 109 | ; * This is the new style user service. |
99 | ; * "Realm" is the table that is used for user lookup. | 110 | ; * "Realm" is the table that is used for user lookup. |
100 | ; * It defaults to "users", which uses the legacy tables | 111 | ; * It defaults to "useraccounts", which uses the new style. |
112 | ; * Realm = "users" will use the legacy tables as an authentication source | ||
101 | ; * | 113 | ; * |
102 | [UserAccountService] | 114 | [UserAccountService] |
103 | ; for the server connector | 115 | ; for the server connector |
@@ -150,7 +162,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
150 | AllowRemoteSetLoginLevel = "false" | 162 | AllowRemoteSetLoginLevel = "false" |
151 | 163 | ||
152 | ; If you run this login server behind a proxy, set this to true | 164 | ; If you run this login server behind a proxy, set this to true |
153 | ; HasProxy = true | 165 | ; HasProxy = false |
154 | 166 | ||
155 | ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) | 167 | ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) |
156 | ; CHANGE THIS | 168 | ; CHANGE THIS |
@@ -159,7 +171,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
159 | SRV_HomeURI = "http://127.0.0.1:8002" | 171 | SRV_HomeURI = "http://127.0.0.1:8002" |
160 | SRV_InventoryServerURI = "http://127.0.0.1:8002" | 172 | SRV_InventoryServerURI = "http://127.0.0.1:8002" |
161 | SRV_AssetServerURI = "http://127.0.0.1:8002" | 173 | SRV_AssetServerURI = "http://127.0.0.1:8002" |
162 | SRV_ProfileServerURI = "http://127.0.0.1:8002" | 174 | SRV_ProfileServerURI = "http://127.0.0.1:8002/user" |
163 | 175 | ||
164 | [GridInfoService] | 176 | [GridInfoService] |
165 | ; These settings are used to return information on a get_grid_info call. | 177 | ; These settings are used to return information on a get_grid_info call. |
@@ -218,7 +230,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
218 | AllowTeleportsToAnyRegion = true | 230 | AllowTeleportsToAnyRegion = true |
219 | 231 | ||
220 | ; If you run this gatekeeper server behind a proxy, set this to true | 232 | ; If you run this gatekeeper server behind a proxy, set this to true |
221 | ; HasProxy = true | 233 | ; HasProxy = false |
222 | 234 | ||
223 | 235 | ||
224 | [UserAgentService] | 236 | [UserAgentService] |
@@ -229,7 +241,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
229 | GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService" | 241 | GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService" |
230 | 242 | ||
231 | ; If you run this user agent server behind a proxy, set this to true | 243 | ; If you run this user agent server behind a proxy, set this to true |
232 | ; HasProxy = true | 244 | ; HasProxy = false |
233 | 245 | ||
234 | ;; If you separate the UserAgentService from the LoginService, set this to | 246 | ;; If you separate the UserAgentService from the LoginService, set this to |
235 | ;; the IP address of the machine where your LoginService is | 247 | ;; the IP address of the machine where your LoginService is |
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index b12e05b..7c13076 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
@@ -16,7 +16,7 @@ | |||
16 | ServiceConnectors = "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" | 16 | ServiceConnectors = "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" |
17 | 17 | ||
18 | ; * 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 |
19 | ; * server instance, if none if specified above | 19 | ; * server instance, if none is specified above |
20 | ; * | 20 | ; * |
21 | [Network] | 21 | [Network] |
22 | port = 8003 | 22 | port = 8003 |
@@ -40,7 +40,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
40 | [AssetService] | 40 | [AssetService] |
41 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | 41 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" |
42 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | 42 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" |
43 | AssetLoaderArgs = "assets/AssetSets.xml" | 43 | AssetLoaderArgs = "./assets/AssetSets.xml" |
44 | AllowRemoteDelete = "false" | 44 | AllowRemoteDelete = "false" |
45 | 45 | ||
46 | ; * This configuration loads the inventory server modules. It duplicates | 46 | ; * This configuration loads the inventory server modules. It duplicates |
@@ -84,9 +84,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
84 | ; Password = "password" | 84 | ; Password = "password" |
85 | 85 | ||
86 | ; * This is the new style authentication service. Currently, only MySQL | 86 | ; * This is the new style authentication service. Currently, only MySQL |
87 | ; * is implemented. "Realm" is the table that is used for user lookup. | 87 | ; * is implemented. |
88 | ; * It defaults to "users", which uses the legacy tables as an | ||
89 | ; * authentication source. | ||
90 | ; * | 88 | ; * |
91 | [AuthenticationService] | 89 | [AuthenticationService] |
92 | ; for the server connector | 90 | ; for the server connector |
@@ -158,7 +156,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
158 | ; MapTileURL = ""; | 156 | ; MapTileURL = ""; |
159 | 157 | ||
160 | ; If you run this login server behind a proxy, set this to true | 158 | ; If you run this login server behind a proxy, set this to true |
161 | ; HasProxy = true | 159 | ; HasProxy = false |
162 | 160 | ||
163 | [GridInfoService] | 161 | [GridInfoService] |
164 | ; These settings are used to return information on a get_grid_info call. | 162 | ; These settings are used to return information on a get_grid_info call. |
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 762b09a..1122cbd 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -84,7 +84,7 @@ | |||
84 | ; Change this to your profile server | 84 | ; Change this to your profile server |
85 | ; accessible from other grids | 85 | ; accessible from other grids |
86 | ; | 86 | ; |
87 | ProfileServerURI = "http://mygridserver.com:8002/profiles" | 87 | ProfileServerURI = "http://mygridserver.com:8002/user" |
88 | 88 | ||
89 | [Modules] | 89 | [Modules] |
90 | ;; 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. |