[Freeswitch-svn] [commit] r8845 - in freeswitch/trunk/conf: . autoload_configs

[Freeswitch SVN]

Author: brian
Date: Wed Jun 25 16:56:01 2008
New Revision: 8845

Modified:
   freeswitch/trunk/conf/autoload_configs/switch.conf.xml
   freeswitch/trunk/conf/vars.xml

Log:
move variables from switch.conf.xml to vars.xml where they belong.

Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml
==============================================================================
--- freeswitch/trunk/conf/autoload_configs/switch.conf.xml	(original)
+++ freeswitch/trunk/conf/autoload_configs/switch.conf.xml	Wed Jun 25 16:56:01 2008
@@ -33,12 +33,6 @@
     <!--<param name="rtp-start-port" value="16384"/>-->
     <!--<param name="rtp-end-port" value="32768"/>-->
   </settings>
-  <!--Any variables defined here will be available in every channel, in the dialplan etc -->
-  <variables>
-    <variable name="uk-ring" value="%(400,200,400,450);%(400,2200,400,450)"/>
-    <variable name="us-ring" value="%(2000, 4000, 440.0, 480.0)"/>
-    <variable name="fr-ring" value="%(1500, 3500, 440.0, 0.0)"/>
-    <variable name="bong-ring" value="v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/>
-  </variables>
+
 </configuration>
 

Modified: freeswitch/trunk/conf/vars.xml
==============================================================================
--- freeswitch/trunk/conf/vars.xml	(original)
+++ freeswitch/trunk/conf/vars.xml	Wed Jun 25 16:56:01 2008
@@ -93,3 +93,8 @@
   <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/>
   <X-PRE-PROCESS cmd="set" data="outbound_caller_id=0000000000"/>
   <X-PRE-PROCESS cmd="set" data="call_debug=false"/>
+
+  <X-PRE-PROCESS cmd="set" data="uk-ring=%(400,200,400,450);%(400,2200,400,450)"/>
+  <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.0)"/>
+  <X-PRE-PROCESS cmd="set" data="fr-ring=%(1500, 3500, 440.0, 0.0)"/>
+  <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/>