From 2fa210243b64bb10fbca37f89176f10efeb25f41 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 19 Apr 2011 21:54:26 +0100 Subject: Clean up freeswitch config to what is currently required. Add explanation to config parameters. Clean up some log messages. --- bin/OpenSim.ini.example | 42 ++++++++++++++++++------- bin/Robust.ini.example | 38 ++++++++++++++++------ bin/config-include/StandaloneCommon.ini.example | 18 +++-------- 3 files changed, 63 insertions(+), 35 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index c05c3de..fbaa590 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -621,10 +621,11 @@ ;; You need to load a local service for a standalone, and a remote service ;; for a grid region. Use one of the lines below, as appropriate + ;; If you're using Freeswitch on a standalone then you will also need to configure the [FreeswitchService] section ; LocalServiceModule = OpenSim.Services.FreeswitchService.dll:FreeswitchService ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector - ;; If using a remote module, specify the server URL + ;; If using a remote connector, specify the server URL ; FreeswitchServiceURL = http://my.grid.server:8003/fsapi @@ -632,20 +633,37 @@ ;; !!!!!!!!!!!!!!!!!!!!!!!!!!! ;; !!!!!!STANDALONE ONLY!!!!!! ;; !!!!!!!!!!!!!!!!!!!!!!!!!!! - ;; IP of your FS server - ;ServerAddress = 85.25.142.92 + ;; The IP address of your FreeSWITCH server. The common case is for this to be the same as the server running the OpenSim standalone + ;; This has to be set for the FreeSWITCH service to work + ;ServerAddress = 127.0.0.1 - ;; All other options are - well - optional - ; Realm = "127.0.0.1" - ; SIPProxy = "127.0.0.1:5060" - ; EchoServer = "127.0.0.1" - ; EchoPort = 50505 - ; AttemptSTUN = "false" + ;; The following configuration parameters are optional + + ;; By default, this is the same as the ServerAddress + ; Realm = 127.0.0.1 + + ;; By default, this is the same as the ServerAddress on port 5060 + ; SIPProxy = 127.0.0.1:5060 + + ;; Default is 5000ms ; DefaultTimeout = 5000 - ; Context = "default" - ; UserName = "freeswitch" - ; Password = "password" + ;; The dial plan context. Default is "default" + ; Context = default + + ;; Currently unused + ; UserName = freeswitch + + ;; Currently unused + ; Password = password + + ;; The following parameters are for STUN = Simple Traversal of UDP through NATs + ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal + ;; stun.freeswitch.org is not guaranteed to be running so use it in + ;; production at your own risk + ; EchoServer = 127.0.0.1 + ; EchoPort = 50505 + ; AttemptSTUN = false [Groups] ;# {Enabled} {} {Enable groups?} {true false} false diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 7c13076..4d16236 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -69,19 +69,37 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; * This is the configuration for the freeswitch server in grid mode [FreeswitchService] LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" - ;; IP of your FS server + + ;; The IP address of your FreeSWITCH server. ; ServerAddress = 127.0.0.1 - ;; All other options are - well - optional - ; Realm = "127.0.0.1" - ; SIPProxy = "127.0.0.1:5060" - ; EchoServer = "127.0.0.1" - ; EchoPort = 50505 - ; AttemptSTUN = "false" + ;; The following configuration parameters are optional + + ;; By default, this is the same as the ServerAddress + ; Realm = 127.0.0.1 + + ;; By default, this is the same as the ServerAddress on port 5060 + ; SIPProxy = 127.0.0.1:5060 + + ;; Default is 5000ms ; DefaultTimeout = 5000 - ; Context = "default" - ; UserName = "freeswitch" - ; Password = "password" + + ;; The dial plan context. Default is "default" + ; Context = default + + ;; Currently unused + ; UserName = freeswitch + + ;; Currently unused + ; Password = password + + ;; The following parameters are for STUN = Simple Traversal of UDP through NATs + ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal + ;; stun.freeswitch.org is not guaranteed to be running so use it in + ;; production at your own risk + ; EchoServer = 127.0.0.1 + ; EchoPort = 50505 + ; AttemptSTUN = false ; * This is the new style authentication service. Currently, only MySQL ; * is implemented. diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index d6f15bb..dcebd63 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -28,10 +28,10 @@ [HGInventoryAccessModule] ProfileServerURI = "http://127.0.0.1:9000/profiles" - ;; If you want to protect your assets from being copied by foreign visitors - ;; uncomment the next line. You may want to do this on sims that have licensed content. - ; OutboundPermission = False + ;; If you want to protect your assets from being copied by foreign visitors + ;; uncomment the next line. You may want to do this on sims that have licensed content. + ; OutboundPermission = False [Modules] ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. @@ -45,16 +45,9 @@ AssetCaching = "CenomeMemoryAssetCache" Include-CenomeCache = "config-include/CenomeCache.ini" - ;; Enable this to use Freeswitch on a standalone - ;FreeswitchServiceInConnector = True - ;; Authorization is not on by default, as it depends on external php ;AuthorizationServices = "LocalAuthorizationServicesConnector" -[FreeswitchService] - ;; Configuration for the freeswitch service goes here - LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" - [GridService] ;; For in-memory region storage (default) StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" @@ -74,9 +67,8 @@ Region_Welcome_Area = "DefaultRegion, FallbackRegion" ; === HG ONLY === - ;; change this to the address of your simulator - Gatekeeper="http://127.0.0.1:9000" - + ;; change this to the address of your simulator + Gatekeeper="http://127.0.0.1:9000" [LibraryModule] ; Set this if you want to change the name of the OpenSim Library -- cgit v1.1 From 575257f3fe7c18bd831c6b0ad63ba30488b075cc Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 19 Apr 2011 21:58:55 +0100 Subject: For consistency, uncomment ColladaMesh option in OpenSimDefaults.ini. Thanks for the spot, Ai Austin. --- bin/OpenSimDefaults.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index e72e851..30ebf84 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -459,7 +459,7 @@ [Mesh] ; enable / disable Collada mesh support ; default is true - ; ColladaMesh = true + ColladaMesh = true [ODEPhysicsSettings] -- cgit v1.1 From b786860bac7adec165843374ebe72b28f9519b78 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 19 Apr 2011 22:38:15 +0100 Subject: synchronize Robust.HG.ini.example FreeSWITCH config with other config files --- bin/Robust.HG.ini.example | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index f12a143..ced2857 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -85,19 +85,41 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; * This is the configuration for the freeswitch server in grid mode [FreeswitchService] LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" - ;; IP of your FS server + + ;; The IP address of your FreeSWITCH server. ; ServerAddress = 127.0.0.1 - ;; All other options are - well - optional - ; Realm = "127.0.0.1" - ; SIPProxy = "127.0.0.1:5060" - ; EchoServer = "127.0.0.1" - ; EchoPort = 50505 - ; AttemptSTUN = "false" + ;; The following configuration parameters are optional + + ;; By default, this is the same as the ServerAddress + ; Realm = 127.0.0.1 + + ;; By default, this is the same as the ServerAddress on port 5060 + ; SIPProxy = 127.0.0.1:5060 + + ;; Default is 5000ms ; DefaultTimeout = 5000 - ; Context = "default" - ; UserName = "freeswitch" - ; Password = "password" + + ;; The dial plan context. Default is "default" + ; Context = default + + ;; Currently unused + ; UserName = freeswitch + + ;; Currently unused + ; Password = password + + ;; The following parameters are for STUN = Simple Traversal of UDP through NATs + ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal + ;; stun.freeswitch.org is not guaranteed to be running so use it in + ;; production at your own risk + ; EchoServer = 127.0.0.1 + ; EchoPort = 50505 + ; AttemptSTUN = false + + LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" + ;; IP of your FS server + ; ServerAddress = 127.0.0.1 ; * This is the new style authentication service. Currently, only MySQL ; * is implemented. -- cgit v1.1