aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-06-02 22:43:44 +0100
committerJustin Clark-Casey (justincc)2011-06-02 22:43:44 +0100
commitdfa4442319397abd91e1ffbf61b02fb63b8f46d2 (patch)
treeec5f35928d6c9f4528c6b3f621a609f654794298 /bin
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-dfa4442319397abd91e1ffbf61b02fb63b8f46d2.zip
opensim-SC_OLD-dfa4442319397abd91e1ffbf61b02fb63b8f46d2.tar.gz
opensim-SC_OLD-dfa4442319397abd91e1ffbf61b02fb63b8f46d2.tar.bz2
opensim-SC_OLD-dfa4442319397abd91e1ffbf61b02fb63b8f46d2.tar.xz
Move the "!!!Standalone Only!!!" [FreeswitchService] section from OpenSim.ini.example to config/StandaloneCommon.ini.example where it belongs.
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example40
-rw-r--r--bin/config-include/StandaloneCommon.ini.example36
2 files changed, 37 insertions, 39 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 55cf89a..813c5b8 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -635,51 +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 ;; This address must be reachable by viewers.
653 ;ServerAddress = 127.0.0.1
654
655 ;; The following configuration parameters are optional
656
657 ;; By default, this is the same as the ServerAddress
658 ; Realm = 127.0.0.1
659
660 ;; By default, this is the same as the ServerAddress on port 5060
661 ; SIPProxy = 127.0.0.1:5060
662
663 ;; Default is 5000ms
664 ; DefaultTimeout = 5000
665
666 ;; The dial plan context. Default is "default"
667 ; Context = default
668
669 ;; Currently unused
670 ; UserName = freeswitch
671
672 ;; Currently unused
673 ; Password = password
674
675 ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
676 ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
677 ;; stun.freeswitch.org is not guaranteed to be running so use it in
678 ;; production at your own risk
679 ; EchoServer = 127.0.0.1
680 ; EchoPort = 50505
681 ; AttemptSTUN = false
682
683[Groups] 645[Groups]
684 ;# {Enabled} {} {Enable groups?} {true false} false 646 ;# {Enabled} {} {Enable groups?} {true false} false
685 ;; Enables the groups module 647 ;; Enables the groups module
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 57380ee..aeebcd0 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -139,6 +139,42 @@
139 ;AllowedClients = "" 139 ;AllowedClients = ""
140 ;DeniedClients = "" 140 ;DeniedClients = ""
141 141
142[FreeswitchService]
143 ;; If FreeSWITCH is not being used then you don't need to set any of these parameters
144 ;;
145 ;; The IP address of your FreeSWITCH server. The common case is for this to be the same as the server running the OpenSim standalone
146 ;; This has to be set for the FreeSWITCH service to work
147 ;; This address must be reachable by viewers.
148 ;ServerAddress = 127.0.0.1
149
150 ;; The following configuration parameters are optional
151
152 ;; By default, this is the same as the ServerAddress
153 ; Realm = 127.0.0.1
154
155 ;; By default, this is the same as the ServerAddress on port 5060
156 ; SIPProxy = 127.0.0.1:5060
157
158 ;; Default is 5000ms
159 ; DefaultTimeout = 5000
160
161 ;; The dial plan context. Default is "default"
162 ; Context = default
163
164 ;; Currently unused
165 ; UserName = freeswitch
166
167 ;; Currently unused
168 ; Password = password
169
170 ;; The following parameters are for STUN = Simple Traversal of UDP through NATs
171 ;; See http://wiki.freeswitch.org/wiki/NAT_Traversal
172 ;; stun.freeswitch.org is not guaranteed to be running so use it in
173 ;; production at your own risk
174 ; EchoServer = 127.0.0.1
175 ; EchoPort = 50505
176 ; AttemptSTUN = false
177
142[GridInfoService] 178[GridInfoService]
143 ; These settings are used to return information on a get_grid_info call. 179 ; These settings are used to return information on a get_grid_info call.
144 ; Client launcher scripts and third-party clients make use of this to 180 ; Client launcher scripts and third-party clients make use of this to