diff options
author | Ai Austin | 2010-08-16 15:19:20 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-20 19:08:26 +0100 |
commit | c41ff51bd3d6806ada2f1e0852bb37b0092b1f25 (patch) | |
tree | 27fc57cc55677836a6229f9db80a223a358efb2c | |
parent | Make some small corrections to ini.example file changes. These are not funct... (diff) | |
download | opensim-SC_OLD-c41ff51bd3d6806ada2f1e0852bb37b0092b1f25.zip opensim-SC_OLD-c41ff51bd3d6806ada2f1e0852bb37b0092b1f25.tar.gz opensim-SC_OLD-c41ff51bd3d6806ada2f1e0852bb37b0092b1f25.tar.bz2 opensim-SC_OLD-c41ff51bd3d6806ada2f1e0852bb37b0092b1f25.tar.xz |
OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section away from end and correction of typo "fro" (fixes Mantis 4833)
-rw-r--r-- | bin/OpenSim.ini.example | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 1ac4845..1ae9f9a 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -297,7 +297,7 @@ | |||
297 | 297 | ||
298 | ; What is reported as the "X-Secondlife-Shard" | 298 | ; What is reported as the "X-Secondlife-Shard" |
299 | ; Defaults to the user server url if not set | 299 | ; Defaults to the user server url if not set |
300 | ; The old default is "OpenSim", set here fro compatibility | 300 | ; The old default is "OpenSim", set here for compatibility |
301 | shard = "OpenSim" | 301 | shard = "OpenSim" |
302 | 302 | ||
303 | ; What is reported as the "User-Agent" when using llHTTPRequest | 303 | ; What is reported as the "User-Agent" when using llHTTPRequest |
@@ -306,6 +306,18 @@ | |||
306 | ; " (Mozilla Compatible)" to the text where there are problems with a web server | 306 | ; " (Mozilla Compatible)" to the text where there are problems with a web server |
307 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" | 307 | ;user_agent = "OpenSim LSL (Mozilla Compatible)" |
308 | 308 | ||
309 | [XMLRPC] | ||
310 | ; ## | ||
311 | ; ## Scripting XMLRPC mapper | ||
312 | ; ## | ||
313 | |||
314 | ; If enabled, this will post an event, "xmlrpc_uri(string)" to the | ||
315 | ; script concurrently with the first remote_data event. | ||
316 | ; This will contain the fully qualified URI an external site needs | ||
317 | ; to use to send XMLRPC requests to that script | ||
318 | |||
319 | ;XmlRpcRouterModule = "XmlRpcRouterModule" | ||
320 | ;XmlRpcPort = 20800 | ||
309 | 321 | ||
310 | [ClientStack.LindenUDP] | 322 | [ClientStack.LindenUDP] |
311 | ; Set this to true to process incoming packets asynchronously. Networking is | 323 | ; Set this to true to process incoming packets asynchronously. Networking is |
@@ -1161,37 +1173,38 @@ | |||
1161 | ;vivox_channel_clamping_distance = 10 | 1173 | ;vivox_channel_clamping_distance = 10 |
1162 | 1174 | ||
1163 | [FreeSwitchVoice] | 1175 | [FreeSwitchVoice] |
1164 | ; In order for this to work you need a functioning freeswitch pbx set | 1176 | ; In order for this to work you need a functioning FreeSWITCH PBX set up. |
1165 | ; up. Configuration for that will be posted in the wiki soon. | 1177 | ; Configuration details at http://opensimulator.org/wiki/Freeswitch_Module |
1166 | enabled = false | 1178 | enabled = false |
1167 | ;FreeSwitch server is going to contact us and ask us all | 1179 | ; FreeSWITCH server is going to contact us and ask us all sorts of things |
1168 | ;sorts of things. | ||
1169 | freeswitch_server_user = freeswitch | 1180 | freeswitch_server_user = freeswitch |
1170 | freeswitch_server_pass = password | 1181 | freeswitch_server_pass = password |
1171 | freeswitch_api_prefix = /api | 1182 | freeswitch_api_prefix = /api |
1172 | ; this is the IP of your sim | 1183 | ; external IP address of your OpenSim voice enabled region |
1184 | ; note: all regions running on same OpenSim.exe will be enabled | ||
1173 | freeswitch_service_server = ip.address.of.your.sim | 1185 | freeswitch_service_server = ip.address.of.your.sim |
1174 | ;freeswitch_service_port = 80 | ||
1175 | ; this should be the same port the region listens on | 1186 | ; this should be the same port the region listens on |
1176 | freeswitch_service_port = 9000 | 1187 | freeswitch_service_port = 9000 |
1177 | freeswitch_realm = ip.address.of.freeswitch.server | 1188 | freeswitch_realm = ip.address.of.freeswitch.server |
1178 | freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060 | 1189 | freeswitch_sip_proxy = ip.address.of.freeswitch.server:5060 |
1190 | ; STUN = Simple Traversal of UDP through NATs | ||
1191 | ; See http://wiki.freeswitch.org/wiki/NAT_Traversal | ||
1192 | ; stun.freeswitch.org is not guaranteed to be running so use it in production at your own risk | ||
1179 | freeswitch_attempt_stun = false | 1193 | freeswitch_attempt_stun = false |
1180 | freeswitch_stun_server = ip.address.of.freeswitch.server | 1194 | freeswitch_stun_server = ip.address.of.stun.server |
1181 | freeswitch_echo_server = ip.address.of.freeswitch.server | 1195 | freeswitch_echo_server = ip.address.of.freeswitch.server |
1182 | freeswitch_echo_port = 50505 | 1196 | freeswitch_echo_port = 50505 |
1183 | freeswitch_well_known_ip = ip.address.of.freeswitch.server | 1197 | freeswitch_well_known_ip = ip.address.of.freeswitch.server |
1184 | 1198 | ; | |
1185 | ;Type the address of your http server here, hostname is allowed. This is provided so you can specify a hostname | 1199 | ; Type the address of your http server here, hostname is allowed. This is provided so you can specify a hostname |
1186 | ;This is used by client for account verification. By default, it's the same as the freeswitch service server. | 1200 | ; This is used by client for account verification. By default, it's the same as the freeswitch service server. |
1187 | 1201 | ; | |
1188 | ;opensim_well_known_http_address = Address_Of_your_SIM_HTTP_Server_Hostname_Allowed | 1202 | ; opensim_well_known_http_address = Address_Of_Your_SIM_HTTP_Server_Hostname_Allowed |
1189 | 1203 | ; | |
1190 | freeswitch_default_timeout = 5000 | 1204 | freeswitch_default_timeout = 5000 |
1191 | freeswitch_subscribe_retry = 120 | 1205 | freeswitch_subscribe_retry = 120 |
1192 | ; freeswitch_password_reset_url = | 1206 | ; freeswitch_password_reset_url = |
1193 | 1207 | ||
1194 | |||
1195 | [Groups] | 1208 | [Groups] |
1196 | Enabled = false | 1209 | Enabled = false |
1197 | 1210 | ||
@@ -1305,16 +1318,8 @@ | |||
1305 | [Modules] | 1318 | [Modules] |
1306 | Include-modules = "addon-modules/*/config/*.ini" | 1319 | Include-modules = "addon-modules/*/config/*.ini" |
1307 | 1320 | ||
1308 | [XMLRPC] | ||
1309 | ; ## | ||
1310 | ; ## Scripting XMLRPC mapper | ||
1311 | ; ## | ||
1312 | |||
1313 | ; If enabled, this will post an event, "xmlrpc_uri(string)" to the | ||
1314 | ; script concurrently with the first remote_data event. | ||
1315 | ; This will contain the fully qualified URI an external site needs | ||
1316 | ; to use to send XMLRPC requests to that script | ||
1317 | |||
1318 | ;XmlRpcRouterModule = "XmlRpcRouterModule" | ||
1319 | ;XmlRpcPort = 20800 | ||
1320 | 1321 | ||
1322 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||
1323 | ;; ENSURE [Architecture] and [Modules] Sections with their "includes" | ||
1324 | ;; are last to allow for overrides | ||
1325 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||