aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2011-06-03 10:32:21 -0700
committerDiva Canto2011-06-03 10:32:21 -0700
commit4ea89f39f2ae87f9cf21308cb307853908e67c7f (patch)
tree03e811f6823023013a6cf2b82b4bb2d1139ae9d9 /bin
parent.ini.example's updated for HG Landmarks (diff)
parentMove the "!!!Standalone Only!!!" [FreeswitchService] section from OpenSim.ini... (diff)
downloadopensim-SC_OLD-4ea89f39f2ae87f9cf21308cb307853908e67c7f.zip
opensim-SC_OLD-4ea89f39f2ae87f9cf21308cb307853908e67c7f.tar.gz
opensim-SC_OLD-4ea89f39f2ae87f9cf21308cb307853908e67c7f.tar.bz2
opensim-SC_OLD-4ea89f39f2ae87f9cf21308cb307853908e67c7f.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example39
-rw-r--r--bin/Robust.HG.ini.example1
-rw-r--r--bin/Robust.ini.example2
-rw-r--r--bin/config-include/StandaloneCommon.ini.example36
4 files changed, 39 insertions, 39 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c5df0db..813c5b8 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -635,50 +635,13 @@
635 635
636 ;; You need to load a local service for a standalone, and a remote service 636 ;; You need to load a local service for a standalone, and a remote service
637 ;; for a grid region. Use one of the lines below, as appropriate 637 ;; for a grid region. Use one of the lines below, as appropriate
638 ;; If you're using Freeswitch on a standalone then you will also need to configure the [FreeswitchService] section 638 ;; If you're using Freeswitch on a standalone then you will also need to configure the [FreeswitchService] section in config-include/StandaloneCommon.ini
639 ; LocalServiceModule = OpenSim.Services.FreeswitchService.dll:FreeswitchService 639 ; LocalServiceModule = OpenSim.Services.FreeswitchService.dll:FreeswitchService
640 ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector 640 ; LocalServiceModule = OpenSim.Services.Connectors.dll:RemoteFreeswitchConnector
641 641
642 ;; If using a remote connector, specify the server URL 642 ;; If using a remote connector, specify the server URL
643 ; FreeswitchServiceURL = http://my.grid.server:8004/fsapi 643 ; FreeswitchServiceURL = http://my.grid.server:8004/fsapi
644 644
645
646[FreeswitchService]
647 ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!
648 ;; !!!!!!STANDALONE ONLY!!!!!!
649 ;; !!!!!!!!!!!!!!!!!!!!!!!!!!!
650 ;; The IP address of your FreeSWITCH server. The common case is for this to be the same as the server running the OpenSim standalone
651 ;; This has to be set for the FreeSWITCH service to work
652 ;ServerAddress = 127.0.0.1
653
654 ;; The following configuration parameters are optional
655
656 ;; By default, this is the same as the ServerAddress
657 ; Realm = 127.0.0.1
658
659 ;; By default, this is the same as the ServerAddress on port 5060
660 ; SIPProxy = 127.0.0.1:5060
661
662 ;; Default is 5000ms
663 ; DefaultTimeout = 5000
664
665 ;; The dial plan context. Default is "default"
666 ; Context = default
667
668 ;; Currently unused
669 ; UserName = freeswitch
670
671 ;; Currently unused
672 ; Password = password
673
674 ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
675 ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
676 ;; stun.freeswitch.org is not guaranteed to be running so use it in
677 ;; production at your own risk
678 ; EchoServer = 127.0.0.1
679 ; EchoPort = 50505
680 ; AttemptSTUN = false
681
682[Groups] 645[Groups]
683 ;# {Enabled} {} {Enable groups?} {true false} false 646 ;# {Enabled} {} {Enable groups?} {true false} false
684 ;; Enables the groups module 647 ;; Enables the groups module
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 0dd93f8..7b2f8ac 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -107,6 +107,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
107 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" 107 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
108 108
109 ;; The IP address of your FreeSWITCH server. 109 ;; The IP address of your FreeSWITCH server.
110 ;; This address must be reachable by viewers.
110 ; ServerAddress = 127.0.0.1 111 ; ServerAddress = 127.0.0.1
111 112
112 ;; The following configuration parameters are optional 113 ;; The following configuration parameters are optional
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index cc018f8..5d0ec09 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -21,7 +21,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
21[Network] 21[Network]
22 port = 8003 22 port = 8003
23 23
24
25 ; HTTPS for "Out of band" management applications such as the remote admin 24 ; HTTPS for "Out of band" management applications such as the remote admin
26 ; module. May specify https_main = True to make the main http server 25 ; module. May specify https_main = True to make the main http server
27 ; use https or "False" to make the main server HTTP 26 ; use https or "False" to make the main server HTTP
@@ -92,6 +91,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
92 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" 91 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
93 92
94 ;; The IP address of your FreeSWITCH server. 93 ;; The IP address of your FreeSWITCH server.
94 ;; This address must be reachable by viewers.
95 ; ServerAddress = 127.0.0.1 95 ; ServerAddress = 127.0.0.1
96 96
97 ;; The following configuration parameters are optional 97 ;; The following configuration parameters are optional
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index cda3ff8..7359bba 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -140,6 +140,42 @@
140 ;AllowedClients = "" 140 ;AllowedClients = ""
141 ;DeniedClients = "" 141 ;DeniedClients = ""
142 142
143[FreeswitchService]
144 ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
145 ;;
146 ;; The IP address of your FreeSWITCH server. The common case is for this to be the same as the server running the OpenSim standalone
147 ;; This has to be set for the FreeSWITCH service to work
148 ;; This address must be reachable by viewers.
149 ;ServerAddress = 127.0.0.1
150
151 ;; The following configuration parameters are optional
152
153 ;; By default, this is the same as the ServerAddress
154 ; Realm = 127.0.0.1
155
156 ;; By default, this is the same as the ServerAddress on port 5060
157 ; SIPProxy = 127.0.0.1:5060
158
159 ;; Default is 5000ms
160 ; DefaultTimeout = 5000
161
162 ;; The dial plan context. Default is "default"
163 ; Context = default
164
165 ;; Currently unused
166 ; UserName = freeswitch
167
168 ;; Currently unused
169 ; Password = password
170
171 ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
172 ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
173 ;; stun.freeswitch.org is not guaranteed to be running so use it in
174 ;; production at your own risk
175 ; EchoServer = 127.0.0.1
176 ; EchoPort = 50505
177 ; AttemptSTUN = false
178
143[GridInfoService] 179[GridInfoService]
144 ; These settings are used to return information on a get_grid_info call. 180 ; These settings are used to return information on a get_grid_info call.
145 ; Client launcher scripts and third-party clients make use of this to 181 ; Client launcher scripts and third-party clients make use of this to